告警记录增加字段

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportDayController.java

@@ -4,6 +4,7 @@ package com.makeit.controller.device;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.elder.PlatElderIdDTO;
 import com.makeit.dto.platform.elder.PlatElderIdDTO;
+import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
@@ -78,7 +79,7 @@ public class SaasDeviceReportDayController {
     @ApiOperation("心率呼吸率")
     @ApiOperation("心率呼吸率")
     @PostMapping("heartRespiratory")
     @PostMapping("heartRespiratory")
     @TenantIdIgnore
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderRealTimeHeartRespiratoryVO>> heartRespiratory(@RequestBody PlatElderIdDTO platElderIdDTO) {
+    public ApiResponseEntity<List<PlatElderRealTimeHeartRespiratoryVO>> heartRespiratory(@RequestBody PlatElderReportDTO platElderIdDTO) {
         return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratory(platElderIdDTO));
         return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratory(platElderIdDTO));
     }
     }
 
 
@@ -99,7 +100,7 @@ public class SaasDeviceReportDayController {
     @ApiOperation("坐标记录")
     @ApiOperation("坐标记录")
     @PostMapping("coordinateList")
     @PostMapping("coordinateList")
     @TenantIdIgnore
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderCoordinateVO>> coordinateList(@RequestBody PlatElderIdDTO platElderIdDTO) {
+    public ApiResponseEntity<List<PlatElderCoordinateVO>> coordinateList(@RequestBody PlatElderReportDTO platElderIdDTO) {
         return ApiResponseUtils.success(platElderDayReportDayService.coordinateList(platElderIdDTO));
         return ApiResponseUtils.success(platElderDayReportDayService.coordinateList(platElderIdDTO));
     }
     }
 
 

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmCheckDTO.java

@@ -27,7 +27,12 @@ public class PlatAlarmCheckDTO {
     private JSONObject properties;
     private JSONObject properties;
 
 
     //PlatAlarmRecord.remark
     //PlatAlarmRecord.remark
+    //异常说明
     private String remark;
     private String remark;
+    //异常值
+    private String abnormalValue;
 
 
     private PlatRegionSetting platRegionSetting;
     private PlatRegionSetting platRegionSetting;
+
+
 }
 }

server-service/src/main/java/com/makeit/entity/platform/alarm/PlatAlarmRecord.java

@@ -75,11 +75,15 @@ public class PlatAlarmRecord extends BaseBusEntity {
      */
      */
     private String elderIds;
     private String elderIds;
 
 
+    //异常说明
     private String remark;
     private String remark;
 
 
     @TableField(exist = false)
     @TableField(exist = false)
     private String elderName;
     private String elderName;
 
 
+    //异常值
+    private String abnormalValue;
+
 
 
 }
 }
 
 

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

@@ -96,6 +96,7 @@ public class BreathAlarm implements IAlarm {
                     return;
                     return;
                 }
                 }
                 fillRemark(platAlarmCheckDTO, br, start, end);
                 fillRemark(platAlarmCheckDTO, br, start, end);
+                platAlarmCheckDTO.setAbnormalValue(Convert.toStr(br));
                 notice(platAlarmCheckDTO);
                 notice(platAlarmCheckDTO);
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStart(now);
                 alarmRedisDTO.setStart(now);

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

@@ -88,6 +88,7 @@ public class HeartAlarm implements IAlarm {
                     return;
                     return;
                 }
                 }
                 fillRemark(platAlarmCheckDTO, hr, start, end);
                 fillRemark(platAlarmCheckDTO, hr, start, end);
+                platAlarmCheckDTO.setAbnormalValue(Convert.toStr(hr));
                 notice(platAlarmCheckDTO);
                 notice(platAlarmCheckDTO);
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStartLong(endLong);
                 alarmRedisDTO.setStart(now);
                 alarmRedisDTO.setStart(now);

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

@@ -338,6 +338,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
 
 
         platAlarmRecord.setElderIds(elderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
         platAlarmRecord.setElderIds(elderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
         platAlarmRecord.setTenantId(config.getTenantId());
         platAlarmRecord.setTenantId(config.getTenantId());
+        platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
+        platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
         return platAlarmRecord;
         return platAlarmRecord;
     }
     }