解决冲突

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

@@ -45,6 +45,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
@@ -102,6 +103,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     @Autowired
     EmqKeeper emqKeeper;
+    //风机状态列表
+    @Value("${fan.statuts.stattuspath}")
+    private String fanStatusImagePathPrefix;
 
     @Value("${pictureUrl}")
     String pictureUrl;
@@ -906,12 +910,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
     public void getListByFJ(String gatewayId,String werks,String stationId){
+        HashMap<String,String> fanstatutsHashMap = new HashMap<>();
         String sql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName ='瞬时风速' ";
         String sql1 = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName ='有功功率'";
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
         List<IndicatorsDto> listData1 = influxDButils.getListData(sql1, IndicatorsDto.class);
         TpriDmpDatabook tpriDmpDatabook = tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName("风机");
         List<Map<String,Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper.getStationInfoMapByStationWerks(werks, tpriDmpDatabook.getDataid().toString());
+        //获取风机列表
+        List<IndexDto> fanStatusList = getFanStatusList(stationId);
+        fanStatusList.forEach(indexDto -> {fanstatutsHashMap.put(indexDto.getEquipmentNumber(),indexDto.getState());});
        int i = 0;
         for (Map<String, Object> dataMap : dataMaps) {
             List<String> numList = Arrays.asList(dataMap.get("equipNum").toString().split(","));
@@ -929,6 +937,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                         map.put("title",listDatum.getEquipmentNumber());
                         map.put("windSpeed",listDatum.getValue());
                         map.put("power",listDatum.getValueLabel());
+                        String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(num))?"正常运行":fanstatutsHashMap.get(num);
+                        map.put("url",fanStatusImagePathPrefix + File.separator + "风机-" + fantStatus + ".gif");
                         statusMaps.add(map);
                     }
                 }