修改es条件错误

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

@@ -2075,7 +2075,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             Map<String, String> shouldCondtion = new HashMap<>();
             queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
             queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("待机", "停机", "告警运行", "限额运行", "降额运行", "故障停机", "通讯故障", "运行"));
-            queryCondtion.put(CommonConstans.QueryStringValue, Arrays.asList("true"));
+            queryCondtion.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
 
             /**
              * 逆变器
@@ -2085,7 +2085,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
              * 汇流箱
              */
             queryCondtion.remove(CommonConstans.QueryStringEquipmentIndexName);
-            queryCondtion.remove(CommonConstans.QueryStringValue);
+            queryCondtion.remove(CommonConstans.QueryStringValueKeyword);
             queryCondtion.put(CommonConstans.QueryStringDataType, Arrays.asList("state"));
             shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "汇流箱");
             List<ESEquipments> indicatorsDtoListHLX = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
@@ -2096,27 +2096,30 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             List<ESEquipments> indicatorsDtoListXB = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
             ;
 
-            indicatorsDtoList.addAll(indicatorsDtoListHLX);
-            indicatorsDtoList.addAll(indicatorsDtoListXB);
+        //    indicatorsDtoList.addAll(indicatorsDtoListHLX);
+         //   indicatorsDtoList.addAll(indicatorsDtoListXB);
 
             List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
             List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
             long time = new Date().getTime();
-            for (ESEquipments esEquipments : indicatorsDtoList) {
-                EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
-                equipAlarmEvent.setEquipIndex(esEquipments.getEquipmentNumber());
-                equipAlarmEvent.setEquipName(esEquipments.getEquipmentSpecificName());
-                equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(esEquipments.getEquipmentIndexName()));
-                equipAlarmEvent.setAlarmDesc(StringUtils.isEmpty(equipAlarmEvent.getAlarmDesc()) ? esEquipments.getEquipmentIndexName() : equipAlarmEvent.getAlarmDesc());
-                equipAlarmEvent.setCreatedTime(esEquipments.getCreatedTime());
-                equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
-                equipAlarmEvent.setSort(time);
-                equipAlarmEvent.setFrontModule(esEquipments.getFrontModule());
-                equipAlarmEvent.setValue(esEquipments.getValue());
-                newEquipAlarmEvents.add(equipAlarmEvent);
-                newEquipAlarmEvent.add(equipAlarmEvent);
+            if (CollectionUtils.isNotEmpty(indicatorsDtoList)){
+                for (ESEquipments esEquipments : indicatorsDtoList) {
+                    EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
+                    equipAlarmEvent.setEquipIndex(esEquipments.getEquipmentNumber());
+                    equipAlarmEvent.setEquipName(esEquipments.getEquipmentSpecificName());
+                    equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(esEquipments.getEquipmentIndexName()));
+                    equipAlarmEvent.setAlarmDesc(StringUtils.isEmpty(equipAlarmEvent.getAlarmDesc()) ? esEquipments.getEquipmentIndexName() : equipAlarmEvent.getAlarmDesc());
+                    equipAlarmEvent.setCreatedTime(esEquipments.getCreatedTime());
+                    equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
+                    equipAlarmEvent.setSort(time);
+                    equipAlarmEvent.setFrontModule(esEquipments.getFrontModule());
+                    equipAlarmEvent.setValue(esEquipments.getValue());
+                    newEquipAlarmEvents.add(equipAlarmEvent);
+                    newEquipAlarmEvent.add(equipAlarmEvent);
+                }
             }
 
+
             String lastSort = equipAlarmEventMapper.getLastDataBySort(stationBasic.getFanGatewayId());
             if (null != lastSort) {
                 List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort, stationBasic.getFanGatewayId());