fix:预警语音模版配置

server-common/src/main/java/com/makeit/utils/msg/sender/SmsVoiceSender.java

@@ -65,7 +65,7 @@ public class SmsVoiceSender implements IMsgSender{
                             paramMap.put("pwd", md32);
                             paramMap.put("time", time);
                             paramMap.put("mobile", vo);
-                            //告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常
+                            //告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5 离床异常
                             if (StringUtils.equals(alarmType, "1")) {
                                 paramMap.put("vid", "142");
                             }
@@ -78,6 +78,9 @@ public class SmsVoiceSender implements IMsgSender{
                             if (StringUtils.equals(alarmType, "4")) {
                                 paramMap.put("vid", "145");
                             }
+                            if (StringUtils.equals(alarmType, "5")) {
+                                paramMap.put("vid", "158");
+                            }
 
                             String[] param = msgDTO.getParam();
                             List<BiConsumer<HashMap<String, String>, String>> consumerList = Arrays.asList(

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

@@ -128,7 +128,7 @@ public class OffBedAlarm implements IAlarm {
                 // alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStart(now);
                 alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
-                platAlarmCheckDTO.setAbnormalValue(String.valueOf(count / 1000));
+                platAlarmCheckDTO.setAbnormalValue(String.valueOf(count));
                 RedisUtil.set(RedisConst.ALARM_DEVICE_OFF_BED_ID + deviceId, alarmRedisDTO);
                 log.warn("推送离床消息，第一次上报时间：{}，开始上报时间：{}，是否上报：{}",
                         getDateTime(alarmRedisDTO.getStartLong()), alarmRedisDTO.getStart(), alarmRedisDTO.getAlarm());
@@ -211,10 +211,5 @@ public class OffBedAlarm implements IAlarm {
         return dateFormat.format(date);
     }
 
-    public static void main(String[] args) {
-        System.out.println(new Date().getTime());
-        // 1702279283249
-        System.out.println(new Date().getTime()-1702279283249L);
-    }
 
 }

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

@@ -413,7 +413,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                     msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName());
                 }
                 if (StringUtils.equals(alarmType, "5")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName());
+                    msgSendDTO.setParam(alarmRecord.getElderName(), "");
                 }
                 msgSendDTO.setAlarmType(alarmConfig.getAlarmType());
                 //todo 小程序消息

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java

@@ -306,11 +306,10 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         return StreamUtil.map(recordList, e -> {
             PlatElderBehaviorExceptionRecordVO vo = new PlatElderBehaviorExceptionRecordVO();
             vo.setTime(e.getAlarmDate());
-
+            vo.setAlarmType(e.getAlarmType());
             //vo.setRoomId(e.get);
             vo.setRoomName(e.getRegionName());
             vo.setDuration(MathUtil.stringToInteger(e.getAbnormalValue()));
-
             return vo;
         });
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -431,6 +431,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             return;
         }
         Map<String, PlatElder> platElderMap = StreamUtil.toMap(dbList, PlatElder::getId);
+        // List<String> spacePathList = dbList.stream().map(PlatElder::getSpacePath)
+        //         .filter(StrUtil::isNotBlank).collect(Collectors.toList());
+        // if (CollUtil.isNotEmpty(spacePathList)) {
+        //     spacePathList.stream().
+        // }
+
         list.forEach(e -> {
             PlatElder platElder = platElderMap.get(e.getId());
             if (platElder == null) {

server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderBehaviorExceptionRecordVO.java

@@ -22,5 +22,8 @@ public class PlatElderBehaviorExceptionRecordVO {
     @ApiModelProperty("时长")//min 或者 s
     private Integer duration;
 
+    @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常, 5 离床异常")
+    private String alarmType;
+
 
 }