修改代码

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1792,16 +1792,20 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
         String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE ( equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' ) and value != 'true'";
         List<IndicatorsDto> queryList  = influxDButils.getListData(querySql,IndicatorsDto.class);
-        List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
-        Set<String> strings = new HashSet<>(collect);
-        zcNum = collect.size()-strings.size();
-
+        if (!ValidationUtil.isEmpty(queryList)) {
+            List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
+            Set<String> strings = new HashSet<>(collect);
+            zcNum = collect.size() - strings.size();
+        }
 
         String querySql1 = " SELECT * FROM indicators_"+gatewayId+"  equipmentIndexName ='通讯异常'  and value = 'true'";
         List<IndicatorsDto> queryList1 = influxDButils.getListData(querySql1,IndicatorsDto.class);
-        List<String> collect1 = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
-        Set<String> strings1 = new HashSet<>(collect);
-        txNum = collect.size()-strings.size();
+        if (!ValidationUtil.isEmpty(queryList1)){
+            List<String> collect1 = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
+            Set<String> strings1 = new HashSet<>(collect1);
+            txNum = collect1.size()-strings1.size();
+        }
+
 
 
         numMap.put("djNum",djNum);