修改代码及定时频次

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

@@ -2064,7 +2064,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0 */5 * * * ?")
     public void addNbqAlarmEvent() {
 
         LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
@@ -2095,9 +2095,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             shouldCondtion.put(CommonConstans.QueryStringFrontMoudle, "箱变");
             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<>();