风机状态bug

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MonitorFanIndicatorMapper.java

@@ -34,7 +34,8 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
 
     Object getIndicatoralueTotal(String gateway,String indicator);
 
-    List<Map<String, String>> getFanConfigPower(@Param("gatewayId") String gatewayId);
+    List<Map<String, String>> getFanConfigPower(@Param("gatewayId") String gatewayId,
+                                                @Param("equipmentNum") String equipmentNum);
 
     List<Map<String, String>> getBoosterStationInfo(@Param("gatewayId") String gatewayId);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -86,7 +86,14 @@
             equipment_specific_name as equipmentSpecificName,
             gateway_id as gatewayId
         from fan_config_power
-        where gateway_id = #{gatewayId}
+            <where>
+                <if test="equipmentNum != null and equipmentNum != ''">
+                    and equipment_number = #{equipmentNum}
+                </if>
+                <if test="gatewayId != null and gatewayId != ''">
+                    and gateway_id = #{gatewayId}
+                </if>
+            </where>
     </select>
 
     <select id="getBoosterStationInfo" resultType="java.util.Map">

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

@@ -278,7 +278,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         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());
+        List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null);
         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);
@@ -323,7 +323,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 filter(indexDto -> fanStatesList.contains(indexDto.getEquipmentIndexName())&&indexDto.getValue().equals("true")).collect(Collectors.toList());
         Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState, (item1, item2) -> item1));
         List<IndexDto> equipNumList=indexDtoList.stream().filter(indexDto -> !ObjectUtils.isEmpty(indexDto.getEquipmentNumber())).collect(Collectors.collectingAndThen(Collectors.toCollection(()->new TreeSet<>(Comparator.comparing(IndexDto::getEquipmentNumber))),ArrayList::new));
-        List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId());
+        List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null);
         List<String > equipmentSpecificNames=fanConfigPower.stream().map(t -> t.get("equipmentSpecificName")).collect(Collectors.toList());
 //        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);
@@ -359,7 +359,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         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());
+        List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), null);
         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);
@@ -407,17 +407,49 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
     public IndexDto getFanBasicInfoByEquipNum(String equipNum, String stationId) {
+        IndexDto indexDto = new IndexDto();
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        String sql = String.format("SELECT equipmentNumber, equipmentSpecificName, equipmentIndexName  FROM \"indicators_%s\" WHERE equipmentNumber = '%s'  order by time desc limit 1", stationBasic.getFanGatewayId(), equipNum);
+        String sql = String.format("SELECT equipmentNumber, equipmentSpecificName, equipmentIndexName  FROM \"indicators_%s\" WHERE equipmentNumber = '%s' and equipmentIndexName =~/^报警状态|停机状态|故障状态|待机状态|维护状态|正常发电状态$/ and value = 'true' order by time desc limit 1", stationBasic.getFanGatewayId(), equipNum);
         List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
         if (CollectionUtils.isNotEmpty(influxDBList)) {
             String equipmentSpecificName = influxDBList.get(0).getEquipmentSpecificName();
             influxDBList.get(0).setEquipmentSpecificName(equipmentSpecificName.substring(0, equipmentSpecificName.indexOf("#")));
             String s = StringUtils.substringAfterLast(equipmentSpecificName, "#");
             influxDBList.get(0).setFanName(s);
-            return influxDBList.get(0);
+            indexDto = influxDBList.get(0);
+        } else {
+            List<Map<String, String>> fanConfigPower = monitorFanIndicatorregionMapper.getFanConfigPower(stationBasic.getFanGatewayId(), equipNum);
+            if (CollectionUtils.isEmpty(fanConfigPower)) {
+                throw new BadRequest("fan_config_power表数据未维护该风机");
+            }
+            String equipmentSpecificName = fanConfigPower.get(0).get("equipmentSpecificName");
+            String substring = equipmentSpecificName.substring(0, equipmentSpecificName.indexOf("#"));
+            indexDto.setEquipmentSpecificName(substring);
+            indexDto.setFanName(StringUtils.substringAfterLast(equipmentSpecificName, "#"));
+            indexDto.setEquipmentIndexName("正常运行");
+            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());
+
+            if (CollectionUtils.isNotEmpty(powList)) {
+                indexDto.setEquipmentIndexName("限功率");
+            }  else if (!timeList.contains(equipNum)) {
+                indexDto.setEquipmentIndexName("通讯中断");
+            }
         }
-        return new IndexDto();
+        return indexDto;
     }
 
     /**