风机状态API修改

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

@@ -244,17 +244,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         StationBasic stationBasic = getOneByStationNumber(stationId);
         String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId());
         List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
-//        Map<String, String> collect1 = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState));
         Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
         String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
         List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
-
         List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId());
         String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|"));
         String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames);
         List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class);
-        Map<String, String> powMap = powerNum.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getValue));
-
+        List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
         Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15);
         String time = "";
         try {
@@ -271,7 +268,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             item.setState(collect.get(item.getEquipmentNumber()));
             if (!collect.containsKey(item.getEquipmentNumber())) {
                 item.setState("正常运行");
-            } else if (powMap.containsKey(item.getEquipmentNumber())) {
+            } else if (powList.contains(item.getEquipmentNumber())) {
                 item.setState("限功率");
             } else if (!timeList.contains(item.getEquipmentNumber())) {
                 item.setState("通讯中断");
@@ -283,9 +280,38 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public List<IndexDto> getFanStatusStatistics(String stationId) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        String sql = String.format("SELECT equipmentNumber, equipmentIndexName FROM \"indicators_%s\" WHERE equipmentIndexName =~/^正常运行|告警运行|正常停机|故障停机|限功率|待机状态|维护状态|通讯中断$/ and value = 'true'", stationBasic.getFanGatewayId());
+        String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true'", stationBasic.getFanGatewayId());
         List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
-        Map<String, Long> collect = influxDBList.stream().collect(Collectors.groupingBy(IndexDto::getEquipmentIndexName, Collectors.counting()));
+        Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
+        String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
+        List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
+        List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId());
+        String equipmentSpecificNames = fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.joining("|"));
+        String powerSql = String.format("SELECT equipmentNumber, value FROM \"indicators_%s\" WHERE equipmentSpecificName =~/^%s$/ and value = '9.0'", stationBasic.getFanGatewayId(), equipmentSpecificNames);
+        List<IndexDto> powerNum = influxDButils.getListData(powerSql, IndexDto.class);
+        List<String> powList = powerNum.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
+        Date currentDayStartTime = DateUtils.dateAddMinutes(new Date(), -15);
+        String time = "";
+        try {
+            time  = DateUtils.dateFormat(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        String timeSql = String.format("select distinct equipmentNumber from \"indicators_%s\" where time >= '%s'", stationBasic.getFanGatewayId(), time);
+        List<IndexDto> timeSqlList = influxDButils.getListData(timeSql, IndexDto.class);
+        List<String> timeList = timeSqlList.stream().map(IndexDto::getEquipmentNumber).collect(Collectors.toList());
+        equipNumList.forEach(item -> {
+            item.setState(collect.get(item.getEquipmentNumber()));
+            if (!collect.containsKey(item.getEquipmentNumber())) {
+                item.setState("正常运行");
+            } else if (powList.contains(item.getEquipmentNumber())) {
+                item.setState("限功率");
+            } else if (!timeList.contains(item.getEquipmentNumber())) {
+                item.setState("通讯中断");
+            }
+        });
+        Map<String, Long> countMap = equipNumList.stream().collect(Collectors.groupingBy(IndexDto::getState, Collectors.counting()));
+        List<IndexDto> resultList = new ArrayList<>();
         List<String> list = Arrays.asList("正常运行", "告警运行", "正常停机", "故障停机", "限功率", "待机状态", "维护状态", "通讯中断");
         HashMap<String, String> colorMap = new HashMap<>();
         colorMap.put("正常运行", "#00aa00");
@@ -296,10 +322,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         colorMap.put("待机状态", "#ff0000");
         colorMap.put("维护状态", "#ff00ff");
         colorMap.put("通讯中断", "#7d8e95");
-        List<IndexDto> resultList = new ArrayList<>();
         list.forEach(item -> {
             IndexDto indexDto = new IndexDto();
-            indexDto.setCountString(collect.containsKey(item) ? String.valueOf(collect.get(item)) : "0");
+            indexDto.setCountString(countMap.containsKey(item) ? String.valueOf(countMap.get(item)) : "0");
             indexDto.setEquipmentIndexName(item);
             indexDto.setColor(colorMap.get(item));
             resultList.add(indexDto);