功能优化

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

@@ -295,7 +295,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     @Override
     public List<String> getRunMonitorByDept(MonitorBaseParam monitorBaseParam) {
         List<String> ids = deptFeignClient.getDepSonIdtByDeptId(monitorBaseParam.getDeptId()).getData();
-        List<String> monitorIds = deptLineService.getLineByDeptIds(ids,monitorBaseParam.getManufacturer(),Stream.of(RunFlagEnum.RUNNING.getStatus()).collect(Collectors.toList()),Stream.of(0,1,2).collect(Collectors.toList()),monitorBaseParam.getObjType());
+        List<String> monitorIds = deptLineService.getLineByDeptIds(ids,monitorBaseParam.getManufacturer(),null,Stream.of(0,1,2).collect(Collectors.toList()),monitorBaseParam.getObjType());
         return monitorIds;
     }
 

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

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
@@ -14,18 +15,17 @@ import com.njcn.device.common.mapper.onlinerate.OnLineRateMapper;
 import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.DeptLineService;
+import com.njcn.device.pq.enums.LineBaseEnum;
+import com.njcn.device.pq.enums.PowerFlagEnum;
+import com.njcn.device.pq.enums.RunFlagEnum;
 import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.dto.MonitorInfoDTO;
 import com.njcn.device.pq.pojo.param.DevRunEvaluateParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.device.pq.enums.LineBaseEnum;
-import com.njcn.device.pq.enums.PowerFlagEnum;
-import com.njcn.device.pq.enums.RunFlagEnum;
-import com.njcn.device.pq.pojo.dto.MonitorInfoDTO;
 import com.njcn.device.pq.service.DeviceRunEvaluateService;
 import com.njcn.device.pq.service.IPqDataVerifyCountService;
 import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
@@ -46,9 +46,8 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
-
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -474,6 +473,9 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
     }
 
     private BigDecimal limitRate(List<RStatLimitRateDPO> limitRatePOList, List<String> lineIds) {
+        if (CollUtil.isEmpty(limitRatePOList)) {
+            return new BigDecimal(0);
+        }
         //超标信息
         List<RStatLimitRateDPO> limitRateDPOS = limitRatePOList.stream().filter(x -> lineIds.contains(x.getLineId())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(limitRateDPOS)) {

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml

@@ -142,10 +142,12 @@
         <foreach collection="dataType" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and device.run_flag in
+        <if test="runFlag!=null and runFlag!=''">
-        <foreach collection="runFlag" item="item" open="(" close=")" separator=",">
+            and device.run_flag in
-            #{item}
+            <foreach collection="runFlag" item="item" open="(" close=")" separator=",">
-        </foreach>
+                #{item}
+            </foreach>
+        </if>
         <if test="objType!=null and objType!=''">
            and lineDetail.big_obj_type = #{objType}
         </if>