Merge remote-tracking branch 'origin/dev' into dev

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

@@ -14,6 +14,7 @@ import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmRedisDTO;
 import com.makeit.utils.AlarmRedisDTO;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
 import com.makeit.utils.redis.RedisUtil;
@@ -36,10 +37,9 @@ public class OffBedAlarm implements IAlarm {
 
 
     @Resource
     @Resource
     private PlatAlarmRecordService platAlarmRecordService;
     private PlatAlarmRecordService platAlarmRecordService;
-
-    private final String CURRENT_DAY = "1";
-
     private final PlatAlarmConfigEnum.AlarmTypeEnum alarmTypeEnum = PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED;
     private final PlatAlarmConfigEnum.AlarmTypeEnum alarmTypeEnum = PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED;
+    @Resource
+    private AlarmConfigCacheUtil alarmConfigCacheUtil;
 
 
     @Override
     @Override
     public boolean support(String alarmType) {
     public boolean support(String alarmType) {
@@ -53,6 +53,7 @@ public class OffBedAlarm implements IAlarm {
      */
      */
     @Override
     @Override
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         log.info("执行离床checkConfig方法：");
         log.info("执行离床checkConfig方法：");
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
@@ -60,8 +61,9 @@ public class OffBedAlarm implements IAlarm {
             log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());
             log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());
             return;
             return;
         }
         }
-        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
-        if (!"5".equals(config.getAlarmType())) {
+        PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
+        log.info("离床预警配置：{}，orgid:{}", JSONUtil.toJsonStr(config), platDevice.getOrgId());
+        if (config == null || StringUtils.isBlank(config.getRuleConfig()) || !"5".equals(config.getAlarmType())) {
             log.error("离床告警配置不存在，config:{}", JSONUtil.toJsonStr(config));
             log.error("离床告警配置不存在，config:{}", JSONUtil.toJsonStr(config));
             return;
             return;
         }
         }
@@ -87,7 +89,6 @@ public class OffBedAlarm implements IAlarm {
         if (properties == null) {
         if (properties == null) {
             properties = new JSONObject();
             properties = new JSONObject();
         }
         }
-        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         String deviceId = platDevice.getId();
         String deviceId = platDevice.getId();
         List<LocalDateTime> timeRange = getOffTimeRange(ruleConfig);
         List<LocalDateTime> timeRange = getOffTimeRange(ruleConfig);
         if (CollUtil.isEmpty(timeRange)) {
         if (CollUtil.isEmpty(timeRange)) {