fix:测试环境暂时关闭

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java

@@ -53,6 +53,9 @@ public class OffBedAlarm implements IAlarm {
      */
      */
     @Override
     @Override
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        if (1 == 1) {
+            return;
+        }
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         log.info("执行离床checkConfig方法：");
         log.info("执行离床checkConfig方法：");
@@ -62,16 +65,8 @@ public class OffBedAlarm implements IAlarm {
             return;
             return;
         }
         }
         PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
         PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
-        log.info("当前config:{},dto config:{}", config.getRuleConfig(), platAlarmCheckDTO.getPlatAlarmConfig().getRuleConfig());
+        // log.info("当前config:{},dto config:{}", config.getRuleConfig(), platAlarmCheckDTO.getPlatAlarmConfig().getRuleConfig());
         offBedCheckAlarm(config, platAlarmCheckDTO, platDevice);
         offBedCheckAlarm(config, platAlarmCheckDTO, platDevice);
-        // PlatAlarmConfig platAlarmConfig = platAlarmCheckDTO.getPlatAlarmConfig();
-        // List<PlatAlarmConfig> configList = platAlarmConfigService.listOfBed(platDevice.getId());
-        // if (CollUtil.isNotEmpty(configList)) {
-        //     configList.forEach(c -> {
-        //         log.info("离床告警dto,org_config:{},设备id：{}", c.getRuleConfig(), platDevice.getId());
-        //         offBedCheckAlarm(c, platAlarmCheckDTO, platDevice);
-        //     });
-        // }
 
 
     }
     }
 
 
@@ -193,7 +188,7 @@ public class OffBedAlarm implements IAlarm {
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
             } else {
             } else {
-                log.info("deviceId:{},cross离床告警,第一次离床时间在范围前，未预警，配置：{},时间持续：{},start:{}", deviceId, config.getRuleConfig(), mills, startLocalDteTime);
+                log.info("deviceId:{},cross离床告警,第一次离床时间在范围前，未预警，配置：{},", deviceId, config.getRuleConfig());
             }
             }
 
 
         } else {
         } else {
@@ -243,7 +238,7 @@ public class OffBedAlarm implements IAlarm {
         }
         }
 
 
         LocalDateTime now = currentTime();
         LocalDateTime now = currentTime();
-        LocalTime localTime = LocalTime.now().plusHours(8);
+        LocalTime localTime = LocalTime.now();
         if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
         if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
             long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
             long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
             boolean noInOverTime = mills >= duration * 60;
             boolean noInOverTime = mills >= duration * 60;
@@ -253,7 +248,7 @@ public class OffBedAlarm implements IAlarm {
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
             } else {
             } else {
-                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前，未预警，配置：{},时间持续：{},start:{}", deviceId, config.getRuleConfig(), mills, startLocalDteTime);
+                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前，未预警，配置：{}", deviceId, config.getRuleConfig());
             }
             }
         } else {
         } else {
             log.info("deviceId:{},UnCrossDay 未满足预警条件！fis:{},config:{}", deviceId, firstTime, config.getRuleConfig());
             log.info("deviceId:{},UnCrossDay 未满足预警条件！fis:{},config:{}", deviceId, firstTime, config.getRuleConfig());
@@ -328,7 +323,7 @@ public class OffBedAlarm implements IAlarm {
     }
     }
 
 
     private static LocalDateTime currentTime() {
     private static LocalDateTime currentTime() {
-        return LocalDateTime.now().plusHours(8);
+        return LocalDateTime.now();
         // return LocalDateTime.now();
         // return LocalDateTime.now();
     }
     }