补充数据调整为24小时

sms_water/src/main/java/com/huaxu/service/AlarmSettingService.java

@@ -96,11 +96,11 @@ public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSe
      * @return
      */
     public void updateRealtimeAlarm(Long[] ids,String updateBy) {
-        //系统中已存在的离线报警
+        //系统中已存在的报警
         List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailMapper.selectStateAlarm(null,null,Arrays.asList(ids));
 
         if(alarmDetailsDtos.size() > 0){
-            //处理完成后，剩下的标记为历史数据
+            //标记为历史数据
             List<Long> deviceIds = new ArrayList<>();
             deviceIds.add(alarmDetailsDtos.get(0).getDeviceId().longValue());
             List<WorkOrderManageByAlarmDto> workOrders = operationManagerClient.findWorkOrderByDeviceIds(deviceIds);
@@ -128,6 +128,8 @@ public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSe
                     //其他情况修改描述
                     operationManagerClient.updateByAlarms(workOrders);
                 }
+            }else{
+                alarmSettingMapper.updateRealtimeAlarm(Arrays.asList(ids),updateBy);
             }
         }
 //        return alarmSettingMapper.updateRealtimeAlarm(Arrays.asList(ids),updateBy);

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataServiceImpl.java

@@ -169,9 +169,9 @@ public class MonitorDataServiceImpl implements MonitorDataService , Initializing
 
         //设备id
         List<Integer> deviceIds = lastHourDataMap.values().stream().map(d -> d.getDeviceId().intValue()).distinct().collect(Collectors.toList());
-        //补数据，前6小时没有统计数据的
+        //补数据，前24小时没有统计数据的
         if(deviceIds.size()>0){
-            for(int i=1;i<7;i++){
+            for(int i=1;i<24;i++){
                 dateTime = LocalDateTime.now().plusHours(-i);
                 //前几小时有统计数据的设备id
                 List<Integer> deviceIdsIsExit = monitorDataMapper.checkReportDataExit(dateTime.getYear(),dateTime.getMonthValue(),dateTime.getDayOfMonth(),dateTime.getHour(),deviceIds);