fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlElectricCarMileageController.java

@@ -2,19 +2,14 @@ package com.ruoyi.web.controller.qdtl;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
 import com.ruoyi.qdtl.service.ITlElectricCarMileageService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -53,39 +48,5 @@ public class TlElectricCarMileageController extends BaseController {
         ExcelUtil<TlElectricCarMileage> util = new ExcelUtil<TlElectricCarMileage>(TlElectricCarMileage.class);
         util.exportExcel(response, list, "电动车里程统计（每日）数据");
     }
-
-    /**
-     * 获取电动车里程统计（每日）详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tlElectricCarMileageService.selectTlElectricCarMileageById(id));
-    }
-
-    /**
-     * 新增电动车里程统计（每日）
-     */
-    @Log(title = "电动车里程统计（每日）", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TlElectricCarMileage tlElectricCarMileage) {
-        return toAjax(tlElectricCarMileageService.insertTlElectricCarMileage(tlElectricCarMileage));
-    }
-
-    /**
-     * 修改电动车里程统计（每日）
-     */
-    @Log(title = "电动车里程统计（每日）", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TlElectricCarMileage tlElectricCarMileage) {
-        return toAjax(tlElectricCarMileageService.updateTlElectricCarMileage(tlElectricCarMileage));
-    }
-
-    /**
-     * 删除电动车里程统计（每日）
-     */
-    @Log(title = "电动车里程统计（每日）", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(tlElectricCarMileageService.deleteTlElectricCarMileageByIds(ids));
-    }
+    
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlElectricDeviceLocationController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.qdtl.domain.ElectricDeviceLocationRecord;
 import com.ruoyi.qdtl.domain.TlElectricDeviceLocation;
 import com.ruoyi.qdtl.service.ITlElectricDeviceLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,9 +81,15 @@ public class TlElectricDeviceLocationController extends BaseController {
      */
     @Log(title = "电动车定位设备轨迹", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TlElectricDeviceLocation tlElectricDeviceLocation) {
-        List<TlElectricDeviceLocation> list = tlElectricDeviceLocationService.selectTlElectricDeviceLocationList(tlElectricDeviceLocation);
-        ExcelUtil<TlElectricDeviceLocation> util = new ExcelUtil<TlElectricDeviceLocation>(TlElectricDeviceLocation.class);
+    public void export(HttpServletResponse response,
+                       String startDate,
+                       String endDate,
+                       String areaName,
+                       String imei) {
+        startDate = startDate + " 00:00:00";
+        endDate = endDate + " 23:59:59";
+        List<ElectricDeviceLocationRecord> list = tlElectricDeviceLocationService.queryLocationRecord(startDate, endDate, areaName, imei);
+        ExcelUtil<ElectricDeviceLocationRecord> util = new ExcelUtil<>(ElectricDeviceLocationRecord.class);
         util.exportExcel(response, list, "电动车定位设备轨迹数据");
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/qdtl/TlWorkPicController.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.qdtl;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -71,6 +73,18 @@ public class TlWorkPicController extends BaseController {
         return toAjax(tlWorkPicService.insertTlWorkPic(tlWorkPic));
     }
 
+    @Log(title = "工作面貌图片顺序调整", businessType = BusinessType.UPDATE)
+    @PostMapping("/changeSortNo")
+    public AjaxResult changeSortNo(@RequestBody JSONObject jsonObject) {
+        Long idOne = jsonObject.getLong("idOne");
+        Long idTwo = jsonObject.getLong("idTwo");
+        boolean b = ObjectUtil.hasEmpty(idOne, idTwo);
+        if (b) {
+            return AjaxResult.error("调整顺序的2条数据不能为空");
+        }
+        return toAjax(tlWorkPicService.changeSortNo(idOne, idTwo));
+    }
+
     /**
      * 修改工作面貌图片管理
      */

ruoyi-system/src/main/java/com/ruoyi/qdtl/domain/ElectricDeviceLocationRecord.java

@@ -27,13 +27,13 @@ public class ElectricDeviceLocationRecord {
     /**
      * 经度 (如果设备过期，值为0)
      */
-    @Excel(name = "经度 (如果设备过期，值为0)")
+    @Excel(name = "经度")
     private String lng;
 
     /**
      * 纬度 (如果设备过期，值为0)
      */
-    @Excel(name = "纬度 (如果设备过期，值为0)")
+    @Excel(name = "纬度")
     private String lat;
 
     /**
@@ -45,9 +45,10 @@ public class ElectricDeviceLocationRecord {
     /**
      * 里程统计
      */
-    @Excel(name = "里程统计")
+    @Excel(name = "累计里程（KM）")
     private String mileage;
 
+    @Excel(name = "当日里程（KM）")
     private String dayMileage;
 
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/mapper/TlElectricCarMileageMapper.java

@@ -1,19 +1,20 @@
 package com.ruoyi.qdtl.mapper;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 电动车里程统计（每日）Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-07-04
  */
-public interface TlElectricCarMileageMapper 
-{
+public interface TlElectricCarMileageMapper {
     /**
      * 查询电动车里程统计（每日）
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 电动车里程统计（每日）
      */
@@ -21,7 +22,7 @@ public interface TlElectricCarMileageMapper
 
     /**
      * 查询电动车里程统计（每日）列表
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 电动车里程统计（每日）集合
      */
@@ -29,7 +30,7 @@ public interface TlElectricCarMileageMapper
 
     /**
      * 新增电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface TlElectricCarMileageMapper
 
     /**
      * 修改电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface TlElectricCarMileageMapper
 
     /**
      * 删除电动车里程统计（每日）
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 结果
      */
@@ -53,9 +54,11 @@ public interface TlElectricCarMileageMapper
 
     /**
      * 批量删除电动车里程统计（每日）
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteTlElectricCarMileageByIds(Long[] ids);
+
+    List<TlElectricCarMileage> queryPeriodDate(@Param("startDate") String startDate, @Param("endDate") String endDate);
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/mapper/TlWorkPicMapper.java

@@ -1,19 +1,19 @@
 package com.ruoyi.qdtl.mapper;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlWorkPic;
 
+import java.util.List;
+
 /**
  * 工作面貌图片管理Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-08-09
  */
-public interface TlWorkPicMapper 
-{
+public interface TlWorkPicMapper {
     /**
      * 查询工作面貌图片管理
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 工作面貌图片管理
      */
@@ -21,7 +21,7 @@ public interface TlWorkPicMapper
 
     /**
      * 查询工作面貌图片管理列表
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 工作面貌图片管理集合
      */
@@ -29,7 +29,7 @@ public interface TlWorkPicMapper
 
     /**
      * 新增工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface TlWorkPicMapper
 
     /**
      * 修改工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface TlWorkPicMapper
 
     /**
      * 删除工作面貌图片管理
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface TlWorkPicMapper
 
     /**
      * 批量删除工作面貌图片管理
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteTlWorkPicByIds(Long[] ids);
+
+    int selectMInSortNo();
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/ITlElectricCarMileageService.java

@@ -1,19 +1,19 @@
 package com.ruoyi.qdtl.service;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
 
+import java.util.List;
+
 /**
  * 电动车里程统计（每日）Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-07-04
  */
-public interface ITlElectricCarMileageService 
-{
+public interface ITlElectricCarMileageService {
     /**
      * 查询电动车里程统计（每日）
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 电动车里程统计（每日）
      */
@@ -21,7 +21,7 @@ public interface ITlElectricCarMileageService
 
     /**
      * 查询电动车里程统计（每日）列表
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 电动车里程统计（每日）集合
      */
@@ -29,7 +29,7 @@ public interface ITlElectricCarMileageService
 
     /**
      * 新增电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITlElectricCarMileageService
 
     /**
      * 修改电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITlElectricCarMileageService
 
     /**
      * 批量删除电动车里程统计（每日）
-     * 
+     *
      * @param ids 需要删除的电动车里程统计（每日）主键集合
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface ITlElectricCarMileageService
 
     /**
      * 删除电动车里程统计（每日）信息
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 结果
      */
     public int deleteTlElectricCarMileageById(Long id);
+
+    List<TlElectricCarMileage> queryPeriodDate(String startDate, String endDate);
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/ITlWorkPicService.java

@@ -1,19 +1,19 @@
 package com.ruoyi.qdtl.service;
 
-import java.util.List;
 import com.ruoyi.qdtl.domain.TlWorkPic;
 
+import java.util.List;
+
 /**
  * 工作面貌图片管理Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-08-09
  */
-public interface ITlWorkPicService 
-{
+public interface ITlWorkPicService {
     /**
      * 查询工作面貌图片管理
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 工作面貌图片管理
      */
@@ -21,7 +21,7 @@ public interface ITlWorkPicService
 
     /**
      * 查询工作面貌图片管理列表
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 工作面貌图片管理集合
      */
@@ -29,7 +29,7 @@ public interface ITlWorkPicService
 
     /**
      * 新增工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITlWorkPicService
 
     /**
      * 修改工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITlWorkPicService
 
     /**
      * 批量删除工作面貌图片管理
-     * 
+     *
      * @param ids 需要删除的工作面貌图片管理主键集合
      * @return 结果
      */
@@ -53,9 +53,11 @@ public interface ITlWorkPicService
 
     /**
      * 删除工作面貌图片管理信息
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 结果
      */
     public int deleteTlWorkPicById(Long id);
+
+    int changeSortNo(Long idOne, Long idTwo);
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlElectricCarMileageServiceImpl.java

@@ -1,93 +1,92 @@
 package com.ruoyi.qdtl.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.qdtl.mapper.TlElectricCarMileageMapper;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
+import com.ruoyi.qdtl.mapper.TlElectricCarMileageMapper;
 import com.ruoyi.qdtl.service.ITlElectricCarMileageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 电动车里程统计（每日）Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2022-07-04
  */
 @Service
-public class TlElectricCarMileageServiceImpl implements ITlElectricCarMileageService 
-{
+public class TlElectricCarMileageServiceImpl implements ITlElectricCarMileageService {
     @Autowired
     private TlElectricCarMileageMapper tlElectricCarMileageMapper;
 
     /**
      * 查询电动车里程统计（每日）
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 电动车里程统计（每日）
      */
     @Override
-    public TlElectricCarMileage selectTlElectricCarMileageById(Long id)
-    {
+    public TlElectricCarMileage selectTlElectricCarMileageById(Long id) {
         return tlElectricCarMileageMapper.selectTlElectricCarMileageById(id);
     }
 
     /**
      * 查询电动车里程统计（每日）列表
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 电动车里程统计（每日）
      */
     @Override
-    public List<TlElectricCarMileage> selectTlElectricCarMileageList(TlElectricCarMileage tlElectricCarMileage)
-    {
+    public List<TlElectricCarMileage> selectTlElectricCarMileageList(TlElectricCarMileage tlElectricCarMileage) {
         return tlElectricCarMileageMapper.selectTlElectricCarMileageList(tlElectricCarMileage);
     }
 
     /**
      * 新增电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
     @Override
-    public int insertTlElectricCarMileage(TlElectricCarMileage tlElectricCarMileage)
-    {
+    public int insertTlElectricCarMileage(TlElectricCarMileage tlElectricCarMileage) {
         return tlElectricCarMileageMapper.insertTlElectricCarMileage(tlElectricCarMileage);
     }
 
     /**
      * 修改电动车里程统计（每日）
-     * 
+     *
      * @param tlElectricCarMileage 电动车里程统计（每日）
      * @return 结果
      */
     @Override
-    public int updateTlElectricCarMileage(TlElectricCarMileage tlElectricCarMileage)
-    {
+    public int updateTlElectricCarMileage(TlElectricCarMileage tlElectricCarMileage) {
         return tlElectricCarMileageMapper.updateTlElectricCarMileage(tlElectricCarMileage);
     }
 
     /**
      * 批量删除电动车里程统计（每日）
-     * 
+     *
      * @param ids 需要删除的电动车里程统计（每日）主键
      * @return 结果
      */
     @Override
-    public int deleteTlElectricCarMileageByIds(Long[] ids)
-    {
+    public int deleteTlElectricCarMileageByIds(Long[] ids) {
         return tlElectricCarMileageMapper.deleteTlElectricCarMileageByIds(ids);
     }
 
     /**
      * 删除电动车里程统计（每日）信息
-     * 
+     *
      * @param id 电动车里程统计（每日）主键
      * @return 结果
      */
     @Override
-    public int deleteTlElectricCarMileageById(Long id)
-    {
+    public int deleteTlElectricCarMileageById(Long id) {
         return tlElectricCarMileageMapper.deleteTlElectricCarMileageById(id);
     }
+
+    @Override
+    public List<TlElectricCarMileage> queryPeriodDate(String startDate, String endDate) {
+        return tlElectricCarMileageMapper.queryPeriodDate(startDate, endDate);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlElectricDeviceLocationServiceImpl.java

@@ -7,11 +7,13 @@ import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.qdtl.domain.ElectricDeviceLocationRecord;
 import com.ruoyi.qdtl.domain.TlElectricCarMileage;
+import com.ruoyi.qdtl.domain.TlElectricDevice;
 import com.ruoyi.qdtl.domain.TlElectricDeviceLocation;
 import com.ruoyi.qdtl.mapper.TlElectricDeviceLocationMapper;
 import com.ruoyi.qdtl.service.IQdCommonService;
 import com.ruoyi.qdtl.service.ITlElectricCarMileageService;
 import com.ruoyi.qdtl.service.ITlElectricDeviceLocationService;
+import com.ruoyi.qdtl.service.ITlElectricDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +41,8 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
     private IQdCommonService qdCommonService;
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private ITlElectricDeviceService electricDeviceService;
 
     /**
      * 查询电动车定位设备轨迹
@@ -127,6 +131,7 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
     public Map<String, Object> getAllElectricDetail() {
         Map<String, Object> result = new HashMap(4);
         List<TlElectricDeviceLocation> list = tlElectricDeviceLocationMapper.queryMaxNewDevice();
+        List<TlElectricDevice> tlElectricDevices = electricDeviceService.queryAllEnableList();
         // 在线数
         long count = list.stream().filter(a -> StrUtil.equals(a.getStatus(), "1")).count();
         // 查询当天的里程数
@@ -138,9 +143,9 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
             tlElectricDeviceLocation.setDayMileage(collect.getOrDefault(tlElectricDeviceLocation.getImei(), "0"));
         }
         // 总设备数
-        result.put("totalCar", list.size());
+        result.put("totalCar", tlElectricDevices.size());
         // 在线率
-        result.put("onlinePercent", NumberUtil.formatPercent(NumberUtil.div(count, list.size()), 1));
+        result.put("onlinePercent", NumberUtil.formatPercent(NumberUtil.div(count, tlElectricDevices.size()), 1));
         // 详情
         result.put("detail", list);
         return result;
@@ -148,7 +153,13 @@ public class TlElectricDeviceLocationServiceImpl implements ITlElectricDeviceLoc
 
     @Override
     public List<ElectricDeviceLocationRecord> queryLocationRecord(String startDate, String endDate, String areaName, String imei) {
+        // 查询日期内的里程统计
+        List<TlElectricCarMileage> periodDate = electricCarMileageService.queryPeriodDate(startDate.substring(0, 10), endDate.substring(0, 10));
+        Map<String, String> collect = periodDate.stream().collect(Collectors.toMap(a -> StrUtil.concat(true, a.getImei(), a.getDays()), TlElectricCarMileage::getMileage));
         List<ElectricDeviceLocationRecord> list = tlElectricDeviceLocationMapper.queryLocationRecord(startDate, endDate, areaName, imei);
+        for (ElectricDeviceLocationRecord electricDeviceLocationRecord : list) {
+            electricDeviceLocationRecord.setDayMileage(collect.getOrDefault(StrUtil.concat(true, electricDeviceLocationRecord.getImei(), electricDeviceLocationRecord.getGpsTime().substring(0, 10)), "0"));
+        }
         return list;
     }
 

ruoyi-system/src/main/java/com/ruoyi/qdtl/service/impl/TlWorkPicServiceImpl.java

@@ -1,96 +1,113 @@
 package com.ruoyi.qdtl.service.impl;
 
-import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.qdtl.mapper.TlWorkPicMapper;
 import com.ruoyi.qdtl.domain.TlWorkPic;
+import com.ruoyi.qdtl.mapper.TlWorkPicMapper;
 import com.ruoyi.qdtl.service.ITlWorkPicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 工作面貌图片管理Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2022-08-09
  */
 @Service
-public class TlWorkPicServiceImpl implements ITlWorkPicService 
-{
+public class TlWorkPicServiceImpl implements ITlWorkPicService {
     @Autowired
     private TlWorkPicMapper tlWorkPicMapper;
 
     /**
      * 查询工作面貌图片管理
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 工作面貌图片管理
      */
     @Override
-    public TlWorkPic selectTlWorkPicById(Long id)
-    {
+    public TlWorkPic selectTlWorkPicById(Long id) {
         return tlWorkPicMapper.selectTlWorkPicById(id);
     }
 
     /**
      * 查询工作面貌图片管理列表
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 工作面貌图片管理
      */
     @Override
-    public List<TlWorkPic> selectTlWorkPicList(TlWorkPic tlWorkPic)
-    {
+    public List<TlWorkPic> selectTlWorkPicList(TlWorkPic tlWorkPic) {
         return tlWorkPicMapper.selectTlWorkPicList(tlWorkPic);
     }
 
     /**
      * 新增工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
     @Override
-    public int insertTlWorkPic(TlWorkPic tlWorkPic)
-    {
+    public int insertTlWorkPic(TlWorkPic tlWorkPic) {
         tlWorkPic.setCreateTime(DateUtils.getNowDate());
+        // 查找最小的序号
+        int minSortNo = tlWorkPicMapper.selectMInSortNo();
+        if (minSortNo == 0) {
+            minSortNo = 10000;
+        }
+        tlWorkPic.setSortNo(minSortNo - 1);
         return tlWorkPicMapper.insertTlWorkPic(tlWorkPic);
     }
 
     /**
      * 修改工作面貌图片管理
-     * 
+     *
      * @param tlWorkPic 工作面貌图片管理
      * @return 结果
      */
     @Override
-    public int updateTlWorkPic(TlWorkPic tlWorkPic)
-    {
+    public int updateTlWorkPic(TlWorkPic tlWorkPic) {
         tlWorkPic.setUpdateTime(DateUtils.getNowDate());
         return tlWorkPicMapper.updateTlWorkPic(tlWorkPic);
     }
 
     /**
      * 批量删除工作面貌图片管理
-     * 
+     *
      * @param ids 需要删除的工作面貌图片管理主键
      * @return 结果
      */
     @Override
-    public int deleteTlWorkPicByIds(Long[] ids)
-    {
+    public int deleteTlWorkPicByIds(Long[] ids) {
         return tlWorkPicMapper.deleteTlWorkPicByIds(ids);
     }
 
     /**
      * 删除工作面貌图片管理信息
-     * 
+     *
      * @param id 工作面貌图片管理主键
      * @return 结果
      */
     @Override
-    public int deleteTlWorkPicById(Long id)
-    {
+    public int deleteTlWorkPicById(Long id) {
         return tlWorkPicMapper.deleteTlWorkPicById(id);
     }
+
+    @Override
+    public int changeSortNo(Long idOne, Long idTwo) {
+        // 查询2条数据
+        TlWorkPic picOne = tlWorkPicMapper.selectTlWorkPicById(idOne);
+        TlWorkPic picTwo = tlWorkPicMapper.selectTlWorkPicById(idTwo);
+        if (picOne == null || picTwo == null) {
+            return 0;
+        }
+        int sortNoOne = picOne.getSortNo();
+        int sortNoTwo = picTwo.getSortNo();
+        picOne.setSortNo(sortNoTwo);
+        picTwo.setSortNo(sortNoOne);
+        tlWorkPicMapper.updateTlWorkPic(picOne);
+        tlWorkPicMapper.updateTlWorkPic(picTwo);
+        return 1;
+    }
 }

ruoyi-system/src/main/resources/mapper/qdtl/TlElectricCarMileageMapper.xml

@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.qdtl.mapper.TlElectricCarMileageMapper">
-    
+
     <resultMap type="TlElectricCarMileage" id="TlElectricCarMileageResult">
-        <result property="id"    column="id"    />
-        <result property="imei"    column="imei"    />
-        <result property="deviceName"    column="device_name"    />
-        <result property="days"    column="days"    />
-        <result property="mileage"    column="mileage"    />
+        <result property="id" column="id"/>
+        <result property="imei" column="imei"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="days" column="days"/>
+        <result property="mileage" column="mileage"/>
     </resultMap>
 
     <sql id="selectTlElectricCarMileageVo">
-        select id, imei, device_name, days, mileage from tl_electric_car_mileage
+        select id, imei, device_name, days, mileage
+        from tl_electric_car_mileage
     </sql>
 
     <select id="selectTlElectricCarMileageList" parameterType="TlElectricCarMileage" resultMap="TlElectricCarMileageResult">
         <include refid="selectTlElectricCarMileageVo"/>
-        <where>  
-            <if test="imei != null  and imei != ''"> and imei = #{imei}</if>
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="days != null  and days != ''"> and days = #{days}</if>
-            <if test="mileage != null  and mileage != ''"> and mileage = #{mileage}</if>
+        <where>
+            <if test="imei != null  and imei != ''">and imei = #{imei}</if>
+            <if test="deviceName != null  and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="days != null  and days != ''">and days = #{days}</if>
+            <if test="mileage != null  and mileage != ''">and mileage = #{mileage}</if>
         </where>
     </select>
-    
+
     <select id="selectTlElectricCarMileageById" parameterType="Long" resultMap="TlElectricCarMileageResult">
         <include refid="selectTlElectricCarMileageVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="queryPeriodDate" resultMap="TlElectricCarMileageResult">
+        <include refid="selectTlElectricCarMileageVo"/>
+        <where>
+            <if test="startDate != null  and startDate != ''">and days &gt;= #{startDate}</if>
+            <if test="endDate != null  and endDate != ''">and days &lt;= #{endDate}</if>
+        </where>
+    </select>
+
     <insert id="insertTlElectricCarMileage" parameterType="TlElectricCarMileage" useGeneratedKeys="true" keyProperty="id">
         insert into tl_electric_car_mileage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -38,13 +47,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null">device_name,</if>
             <if test="days != null">days,</if>
             <if test="mileage != null">mileage,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="imei != null">#{imei},</if>
             <if test="deviceName != null">#{deviceName},</if>
             <if test="days != null">#{days},</if>
             <if test="mileage != null">#{mileage},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTlElectricCarMileage" parameterType="TlElectricCarMileage">
@@ -59,11 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTlElectricCarMileageById" parameterType="Long">
-        delete from tl_electric_car_mileage where id = #{id}
+        delete
+        from tl_electric_car_mileage
+        where id = #{id}
     </delete>
 
     <delete id="deleteTlElectricCarMileageByIds" parameterType="String">
-        delete from tl_electric_car_mileage where id in 
+        delete from tl_electric_car_mileage where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-system/src/main/resources/mapper/qdtl/TlWorkPicMapper.xml

@@ -43,6 +43,11 @@
         where id = #{id}
     </select>
 
+    <select id="selectMInSortNo" resultType="java.lang.Integer">
+        select ifnull(min(sort_no), 0)
+        from tl_work_pic
+    </select>
+
     <insert id="insertTlWorkPic" parameterType="TlWorkPic" useGeneratedKeys="true" keyProperty="id">
         insert into tl_work_pic
         <trim prefix="(" suffix=")" suffixOverrides=",">