光伏状态监控报错

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

@@ -849,16 +849,26 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public List<Map<String, Object>> getStatusGzp(String gatewayId, String systemType, String frontModule, String equipNum) {
-        String sql = "    SELECT displayName  , value as state,equipmentIndexName   FROM indicators_" + gatewayId + " WHERE  frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "'";
+        String sql = "    SELECT displayName ,equipmentNumber , value as state,equipmentIndexName   FROM indicators_" + gatewayId + " WHERE  frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "'";
         if (null != equipNum) {
-            sql = "    SELECT displayName  , value as state,equipmentIndexName  FROM indicators_" + gatewayId + " WHERE  frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "' and equipmentNumber ='" + equipNum + "'";
+            sql = "    SELECT displayName  , equipmentNumber ,  value as state,equipmentIndexName  FROM indicators_" + gatewayId + " WHERE  frontModule =~/" + frontModule + "/ and systemType = '" + systemType + "' and equipmentNumber ='" + equipNum + "'";
         }
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
 
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (IndicatorsDto listDatum : listData) {
             Map<String, Object> statusMap = new HashMap<>();
-            statusMap.put("data", StringUtils.isEmpty(listDatum.getDisplayName()) ? listDatum.getEquipmentIndexName() : listDatum.getDisplayName());
+            String data = listDatum.getDisplayName();
+            if(StringUtils.isEmpty(data)){
+               data=listDatum.getEquipmentIndexName();
+            }else {
+              if(data.equals(listDatum.getEquipmentNumber())){
+                  data=listDatum.getEquipmentIndexName();
+              }else {
+                   data = listDatum.getDisplayName();
+              }
+            }
+            statusMap.put("data", data);
             statusMap.put("state", listDatum.getState().equals("false") ? 1 : 0);
             statusMap.put("status", listDatum.getState().equals("false") ? 1 : 0);
             statusMap.put("title", listDatum.getState().equals("false") ? "断" : "通");