fix: 跌倒雷达需要记录 停留时长

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

@@ -18,6 +18,7 @@ import com.makeit.service.platform.alarm.PlatDayDurationRecordService;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmRedisDTO;
 import com.makeit.utils.AlarmRedisDTO;
 import com.makeit.utils.DayDurationUtil;
 import com.makeit.utils.DayDurationUtil;
+import com.makeit.utils.data.convert.BeanDtoVoUtils;
 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;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -162,7 +163,9 @@ public class FallAlarm implements IAlarm {
                 return;
                 return;
             }
             }
             //保存每次进入空间时长
             //保存每次进入空间时长
-            platDayDurationRecordService.saveDayDurationRecord(platAlarmCheckDTO, alarmRedisDTO);
+            PlatAlarmCheckDTO platAlarmCheckDTO_behavior = BeanDtoVoUtils.convert(platAlarmCheckDTO, PlatAlarmCheckDTO.class);
+            platAlarmCheckDTO_behavior.setPlatAlarmConfig(config);
+            platDayDurationRecordService.saveDayDurationRecord(platAlarmCheckDTO_behavior, alarmRedisDTO);
             RedisUtil.delete(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId);
             RedisUtil.delete(RedisConst.ALARM_DEVICE_BEHAVIOR_ID + deviceId);
         }
         }
     }
     }

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatDayDurationRecordServiceImpl.java

@@ -62,10 +62,10 @@ implements PlatDayDurationRecordService {
         }
         }
 
 
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
-        if(CollectionUtils.isNotEmpty(platElderList)){
-            platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
-            platElderList = platAlarmCheckDTO.getPlatElderList();
-        }
+//        if(CollectionUtils.isNotEmpty(platElderList)){
+//            platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+//            platElderList = platAlarmCheckDTO.getPlatElderList();
+//        }
         for (PlatElder platElder : platElderList) {
         for (PlatElder platElder : platElderList) {
             if(StringUtils.isBlank(platElder.getRegionName())){
             if(StringUtils.isBlank(platElder.getRegionName())){
                 continue;
                 continue;