解决冲突

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

@@ -1029,7 +1029,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
             String zb1Sql = String.format("SELECT * FROM \"indicators_%s\" WHERE  frontModule = '1主变' and systemType = '模拟量'  and (displayName = '档位' or displayName = '油面温1' or displayName = '油面温2' or displayName = '绕组温度' ) ", gatewayId);
             List<IndicatorsDto> zb1SqlData = influxDButils.getListData(zb1Sql, IndicatorsDto.class);
-            // TODO: 2023/7/14 数据未整理  --->  油面温1   油面温2   绕组温度
             resultMap.put("value1", "0.0");
             resultMap.put("value2", "0.0");
             resultMap.put("value3", "0.0");
@@ -1176,7 +1175,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             String url = "";
             if (listDatum.getDisplayName().contains("手车工作位置")){
                 String[] split = listDatum.getPictureName().split(":");
-                if (listDatum.getValue().equals("true")){
+                if (listDatum.getValue().equals("false")){
                     String[] split1 = split[0].split(",");
                     photoUrls.put(listDatum.getDisplayName().split("_")[0]+"scsurl",pictureUrl+split1[0]);
                     photoUrls.put(listDatum.getDisplayName().split("_")[0]+"scxurl",pictureUrl+split1[1]);