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

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

 package com.makeit.service.platform.alarm.alarmStrategy;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigBehaviorDTOVO;
@@ -61,6 +62,7 @@ public class FallAlarm implements IAlarm {
      */
     @Override
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        log.info("跌倒预警config开始");
         JSONObject properties = platAlarmCheckDTO.getProperties();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         String deviceId = platDevice.getId();
@@ -68,7 +70,7 @@ public class FallAlarm implements IAlarm {
             properties = new JSONObject();
         }
         String personState = Convert.toStr(properties.get("personState"));
-
+        log.info("跌倒预警personState：{}", personState);
         //记录停留时长
         recordDuration(platAlarmCheckDTO);
 
@@ -182,8 +184,10 @@ public class FallAlarm implements IAlarm {
     @Override
     public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
+        log.info("跌倒预警参数platAlarmCheckDTO：{}", platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
+        log.info("跌倒预警长者：{}", JSONUtil.toJsonStr(platElderList));
         PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
         if (CommonEnum.NO.getValue().equals(config.getStatus())) {
             log.error("告警配置为禁用，告警配置id:" + config.getId());

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

@@ -107,7 +107,7 @@ public class HeartAlarm implements IAlarm {
             RedisUtil.delete(RedisConst.ALARM_DEVICE_HR_ID + deviceId);
             return;
         }
-
+        log.info("hr:{},end:{},start:{},mes:{}", hr, end, start, messageType);
         if ((hr > end || hr < start) && StringUtils.equalsAnyIgnoreCase(messageType, "REPORT_PROPERTY")) {
             if(alarmRedisDTO==null){
                 alarmRedisDTO = new AlarmRedisDTO();