风机列表API修改

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -33,4 +34,5 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
 
     Object getIndicatoralueTotal(String gateway,String indicator);
 
+    List<Map<String, String>> getFanConfigPower(@Param("gatewayId") String gatewayId);
 }

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

@@ -79,6 +79,13 @@
         indicator like concat('%',#{indicator},'%')
     </select>
 
-
-
+    <select id="getFanConfigPower" resultType="java.util.Map">
+        select
+            sequence_nbr as id,
+            equipment_number as equipmentNumber,
+            equipment_specific_name as equipmentSpecificName,
+            gateway_id as gatewayId
+        from fan_config_power
+        where gateway_id = #{gatewayId}
+    </select>
 </mapper>

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
@@ -60,6 +61,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     @Autowired
+    SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
+
+    @Autowired
+    TpriDmpDatabookServiceImpl tpriDmpDatabookServiceImpl;
+
+    @Autowired
     TemporaryDataMapper temporaryDataMapper;
 
     @Autowired
@@ -235,14 +242,42 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public List<IndexDto> getFanStatusList(String stationId) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state 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, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState));
+//        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));
+
+        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 (powMap.containsKey(item.getEquipmentNumber())) {
+                item.setState("限功率");
+            } else if (!timeList.contains(item.getEquipmentNumber())) {
+                item.setState("通讯中断");
+            }
         });
+
         return equipNumList;
     }