bug修改

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java

@@ -44,6 +44,7 @@ public interface DeviceMapper extends BaseMapper<Device> {
      */
     List<RunManageVO> getRunManageList(@Param("list") List<String> list,
                                        @Param("comFlag") List<Integer> comFlag,
+                                       @Param("runFlag") List<Integer> runFlag,
                                        @Param("searchValue") String searchValue);
 
     /**

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml

@@ -27,9 +27,11 @@
         manufacturerId.name as manufacturer,
         dev.name as devName,
         device.IP as ip,
-        case device.Run_Flag when 0 then "投运"
+        case linedetail.Run_Flag when 0 then "投运"
-        when 1 then "热备用"
+        when 1 then "检修"
         when 2 then "停运"
+        when 3 then "调试"
+        when 4 then "退运"
         end as runFlag,
         case device.Com_Flag when 0 then "中断"
         when 1 then "正常"
@@ -107,6 +109,12 @@
                 #{item2}
             </foreach>
         </if>
+        <if test="runFlag.size()!=0">
+            and linedetail.run_Flag in
+            <foreach item="item" collection="runFlag" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="searchValue != '' and searchValue != null ">
             <bind name="searchValueLike" value="'%'+searchValue+'%'"/>
             AND sub.NAME LIKE #{searchValueLike}
@@ -272,9 +280,13 @@
         WHEN 0 THEN
         "投运"
         WHEN 1 THEN
-        "热备用"
+        "检修"
         WHEN 2 THEN
         "停运"
+        WHEN 3 THEN
+        "调试"
+        WHEN 4 THEN
+        "退运"
         END AS runFlag,
         CASE
         device.Com_Flag

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -71,10 +72,10 @@ public class RunManageServiceImpl implements RunManageService {
     public List<RunManageVO> getLineLedger(RunManageParam runManageParam) {
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         BeanUtil.copyProperties(runManageParam, deviceInfoParam);
-        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0,1,2).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         List<String> lineIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(lineIndexes)) {
-            return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
+            return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
         } else {
             return new ArrayList<>();
         }
@@ -115,11 +116,14 @@ public class RunManageServiceImpl implements RunManageService {
     public Page<RunTimeVO> getDeviceLedger(RunManageParam runManageParam) {
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
         BeanUtil.copyProperties(runManageParam, deviceInfoParam);
-        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0, 1, 2).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
         if (CollectionUtils.isEmpty(generalDeviceDTOList)) {
             throw new BusinessException("当前部门没有装置台账");
         }
         List<String> devIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getDeviceIndexes().stream()).collect(Collectors.toList());
+        if(CollUtil.isEmpty(devIndexes)){
+            return new Page<>();
+        }
         //List<String> manuList = runManageParam.getManufacturer().stream().map(SimpleDTO::getId).collect(Collectors.toList());
         return deviceMapper.getDeviceLedger(new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam)), devIndexes, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), null);
     }