提交代码

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

@@ -2125,23 +2125,36 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */10 * * * ?")
+	//@Scheduled(cron = "0/1 * * * * ?") 
 	public void addNbqAlarmEvent() {
 
 		LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(BaseEntity::getIsDelete, false);
+		wrapper.like(StationBasic::getStationType, "GFDZ");
 		List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
 		for (StationBasic stationBasic : stationBasics) {
 			Map<String, List<String>> queryCondtion = new HashMap<>();
 			Map<String, String> shouldCondtion = new HashMap<>();
 			queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
-            queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("待机", "停机", "告警运行", "限额运行", "降额运行", "故障停机", "通讯故障", "运行"));
+			queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName,
+					Arrays.asList("待机", "停机", "告警运行", "限额运行", "降额运行", "故障停机", "通讯故障", "运行"));
 			queryCondtion.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
 
 			/**
 			 * 逆变器
 			 */
-            List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+			List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null,
+					ESEquipments.class);
+			Collections.sort(indicatorsDtoList, (a, b) -> (b.getCreatedTime())
+                    .compareTo(a.getCreatedTime()));
+
+			//过滤重复状态
+			List<ESEquipments> nindicatorsDtoList=indicatorsDtoList.stream().collect(Collectors.collectingAndThen(
+	                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ESEquipments::getDisplayName))), ArrayList::new));
+
+
+			
 			/**
 			 * 汇流箱
 			 */
@@ -2149,26 +2162,29 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 			queryCondtion.remove(CommonConstans.QueryStringValueKeyword);
 			queryCondtion.put(CommonConstans.QueryStringDataType, Arrays.asList("state"));
 			shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "汇流箱");
-            List<ESEquipments> indicatorsDtoListHLX = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
+			List<ESEquipments> indicatorsDtoListHLX = commonServiceImpl.getListDataByCondtions(queryCondtion,
+					shouldCondtion, ESEquipments.class);
 			/**
 			 * 箱变
 			 */
 			shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "箱变");
-            List<ESEquipments> indicatorsDtoListXB = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondtion, ESEquipments.class);
-            ;
-            indicatorsDtoList.addAll(indicatorsDtoListHLX);
-           indicatorsDtoList.addAll(indicatorsDtoListXB);
+			List<ESEquipments> indicatorsDtoListXB = commonServiceImpl.getListDataByCondtions(queryCondtion,
+					shouldCondtion, ESEquipments.class);
+			nindicatorsDtoList.addAll(indicatorsDtoListHLX);
+			nindicatorsDtoList.addAll(indicatorsDtoListXB);
 
 			List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
 			List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
 			long time = new Date().getTime();
-            if (CollectionUtils.isNotEmpty(indicatorsDtoList)){
-                for (ESEquipments esEquipments : indicatorsDtoList) {
+			if (CollectionUtils.isNotEmpty(nindicatorsDtoList)) {
+				for (ESEquipments esEquipments : nindicatorsDtoList) {
 					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.setAlarmDesc(
+							StringUtils.isEmpty(equipAlarmEvent.getAlarmDesc()) ? esEquipments.getEquipmentIndexName()
+									: equipAlarmEvent.getAlarmDesc());
 					equipAlarmEvent.setCreatedTime(esEquipments.getCreatedTime());
 					equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
 					equipAlarmEvent.setSort(time);
@@ -2179,15 +2195,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 				}
 			}
 
-
 			String lastSort = equipAlarmEventMapper.getLastDataBySort(stationBasic.getFanGatewayId());
 			if (null != lastSort) {
-                List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort, stationBasic.getFanGatewayId());
+				List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort,
+						stationBasic.getFanGatewayId());
 				for (EquipAlarmEvent oldEquipAlarmEvent : oldEquipAlarmEvents) {
 					for (EquipAlarmEvent equipAlarmEvent : newEquipAlarmEvents) {
-                        if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) &&
-                                oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc()) &&
-                                oldEquipAlarmEvent.getValue().equals(equipAlarmEvent.getValue())) {
+						if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex())
+								&& oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc())
+								&& oldEquipAlarmEvent.getValue().equals(equipAlarmEvent.getValue())) {
 							newEquipAlarmEvent.remove(equipAlarmEvent);
 						}
 					}