fix:告警配置更新

fc8e4e52 · 李小龙 · 3451132e · fc8e4e52 · fc8e4e52 · fc8e4e52
Commit fc8e4e52 authored Sep 26, 2023 by 李小龙
Showing with 44 additions and 31 deletions
server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmCheckDTO.java
server-service/src/main/java/com/makeit/entity/platform/elder/PlatElder.java
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
--- a/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmCheckDTO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmCheckDTO.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.PlatElder;
-import com.makeit.entity.platform.space.PlatRegionSetting;
 import com.makeit.entity.platform.space.PlatRoom;
 import lombok.Data;
@@ -32,7 +31,5 @@ public class PlatAlarmCheckDTO {
    //异常值
    private String abnormalValue;
-    private PlatRegionSetting platRegionSetting;
 }
--- a/server-service/src/main/java/com/makeit/entity/platform/elder/PlatElder.java
+++ b/server-service/src/main/java/com/makeit/entity/platform/elder/PlatElder.java
@@ -194,5 +194,8 @@ public class PlatElder extends BaseBusEntity {
    @ApiModelProperty(value = "退住时间")
    private LocalDateTime checkOutTime;
+    @TableField(exist = false)
+    private String regionName;
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
@@ -8,6 +8,7 @@ import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
+import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 /**
@@ -55,7 +56,7 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
     */
    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
-    PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
+    PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO, PlatElder platElder);
    void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
@@ -2,7 +2,6 @@ package com.makeit.service.platform.alarm.alarmStrategy;
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
-import com.makeit.common.entity.BaseEntity;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigBehaviorDTOVO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
@@ -10,7 +9,6 @@ import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.alarm.PlatDayDurationRecord;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.PlatElder;
-import com.makeit.entity.platform.space.PlatRegionSetting;
 import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
@@ -33,7 +31,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 @Component
 @Slf4j
@@ -148,7 +145,7 @@ public class BehaviorAlarm implements IAlarm {
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
-        PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
        Date now = new Date();
        long endLong = now.getTime();
        long count = endLong - alarmRedisDTO.getStartLong();
@@ -161,21 +158,24 @@ public class BehaviorAlarm implements IAlarm {
        PlatRoom platRoom = platAlarmCheckDTO.getPlatRoom();
        List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
+        if(CollectionUtils.isNotEmpty(platElderList)){
+            platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        }
+        for (PlatElder platElder : platElderList) {
            PlatDayDurationRecord durationRecord = new PlatDayDurationRecord();
-        durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
+            durationRecord.setElderIds(platElder.getId());
+            durationRecord.setRegionName(platElder.getRegionName());
            durationRecord.setDuration(count);
            durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
            durationRecord.setDay(alarmRedisDTO.getStart());
            durationRecord.setStartDate(alarmRedisDTO.getStart());
            durationRecord.setEndDate(now);
            durationRecord.setTenantId(config.getTenantId());
-        durationRecord.setRoomId(platRoom.getId());
+            durationRecord.setRoomId(platElder.getRoomId());
            durationRecord.setDeviceId(platDevice.getId());
-        if (platRegionSetting != null) {
-            durationRecord.setRegionName(platRegionSetting.getRegionName());
-        }
            platDayDurationRecordService.saveOrUpdate(durationRecord);
        }
+    }
    @Override
    public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
@@ -202,7 +202,7 @@ public class BehaviorAlarm implements IAlarm {
            param.add(platElder.getName());
            param.add(platRoom.getName());
            platAlarmCheckDTO.setParam(param);
-            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO,platElder);
            platAlarmRecord.setElderIds(platElder.getId());
            platAlarmRecord.setElderName(platElder.getName());
            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(), platAlarmRecord);

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
@@ -163,7 +163,7 @@ public class BreathAlarm implements IAlarm {
            param.add(platElder.getName());
            param.add(platAlarmCheckDTO.getRemark());
            platAlarmCheckDTO.setParam(param);
-            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO,platElder);
            platAlarmRecord.setElderIds(platElder.getId());
            platAlarmRecord.setElderName(platElder.getName());
            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(), platAlarmRecord);

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
@@ -83,7 +83,7 @@ public class FallAlarm implements IAlarm {
            param.add(platElder.getName());
            param.add(platRoom.getName());
            platAlarmCheckDTO.setParam(param);
-            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO,platElder);
            platAlarmRecord.setElderIds(platElder.getId());
            platAlarmRecord.setElderName(platElder.getName());
            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(), platAlarmRecord);

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
@@ -144,7 +144,7 @@ public class HeartAlarm implements IAlarm {
            param.add(platElder.getName());
            param.add(platAlarmCheckDTO.getRemark());
            platAlarmCheckDTO.setParam(param);
-            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO);
+            PlatAlarmRecord platAlarmRecord = platAlarmRecordService.convertToPlatAlarmRecord(platAlarmCheckDTO,platElder);
            platAlarmRecord.setElderIds(platElder.getId());
            platAlarmRecord.setElderName(platElder.getName());
            platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(), platAlarmRecord);

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
@@ -321,13 +321,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
    }
    @Override
-    public PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public PlatAlarmRecord convertToPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO,PlatElder platElder) {
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
        List<String> param = platAlarmCheckDTO.getParam();
-        List<PlatElder> elderList = platAlarmCheckDTO.getPlatElderList();
-        PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
        PlatAlarmRecord platAlarmRecord = new PlatAlarmRecord();
        platAlarmRecord.setAlarmId(config.getId());
@@ -341,13 +340,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
        platAlarmRecord.setNotifyUser(config.getNotifyUser());
        platAlarmRecord.setDeviceId(platDevice.getId());
-        platAlarmRecord.setElderIds(elderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
+        platAlarmRecord.setElderIds(platElder.getId());
        platAlarmRecord.setTenantId(config.getTenantId());
        platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
        platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
-        if(platRegionSetting!=null) {
+        platAlarmRecord.setRegionName(platElder.getRegionName());
-            platAlarmRecord.setRegionName(platRegionSetting.getRegionName());
-        }
        return platAlarmRecord;
    }
@@ -364,11 +361,15 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
        roomBedDeviceLambdaQueryWrapper.eq(PlatRoomBedDevice::getDeviceId, platDevice.getId())
                .eq(BaseBusEntity::getTenantId,tenantId)
        ;
-        PlatRoomBedDevice platRoomBedDevice = platRoomBedDeviceService.getOne(roomBedDeviceLambdaQueryWrapper, false);
+        //todo  要支持 设备绑定多个空间
-        if(platRoomBedDevice==null){
+        List<PlatRoomBedDevice> platRoomBedDeviceList = platRoomBedDeviceService.list(roomBedDeviceLambdaQueryWrapper);
+        if(CollectionUtils.isNotEmpty(platRoomBedDeviceList)){
            throw  new BusinessException("设备没绑定房间:"+platDevice.getId());
        }
+        platRoomBedDeviceList.forEach(platRoomBedDevice -> {
+            //获取区域
+            String regionName = null;
            if(StringUtils.isNotBlank(platRoomBedDevice.getRoomId())) {
                PlatRoom platRoom = platRoomService.getById(platRoomBedDevice.getRoomId());
                platAlarmCheckDTO.setPlatRoom(platRoom);
@@ -380,8 +381,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                ;
                //区域设置
                PlatRegionSetting platRegionSetting = platRegionSettingService.getOne(platRegionSettingLambdaQueryWrapper, false);
-            platAlarmCheckDTO.setPlatRegionSetting(platRegionSetting);
+                if(platRegionSetting != null){
+                    regionName = platRegionSetting.getRegionName();
                }
+            }
+            //获取床位长者
            String bedId = platRoomBedDevice.getBedId();
            if (StringUtils.isNotBlank(bedId)) {
                LambdaQueryWrapper<PlatElder> elderLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -390,12 +394,15 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                ;
                List<PlatElder> list = platElderService.list(elderLambdaQueryWrapper);
                if(CollectionUtils.isNotEmpty(list)) {
+                    for (PlatElder platElder : list) {
+                        platElder.setRegionName(regionName);
+                    }
                    platAlarmCheckDTO.setPlatElderList(list);
                    return;
                }
            }
+            //获取房间长者
            String roomId = platRoomBedDevice.getRoomId();
            if (StringUtils.isNotBlank(roomId)) {
                LambdaQueryWrapper<PlatElder> elderLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -403,9 +410,15 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                        .eq(BaseBusEntity::getTenantId,tenantId)
                ;
                List<PlatElder> list = platElderService.list(elderLambdaQueryWrapper);
+                for (PlatElder platElder : list) {
+                    platElder.setRegionName(regionName);
+                }
                platAlarmCheckDTO.setPlatElderList(list);
            }
                }
+        );
+    }
    private String replaceParam(String oriContent,List<String> param) {
        Pattern p = Pattern.compile("\\[#\\d+\\]|\\[#[\\p{IsHan}]+\\]|\\[#[^\\]]*\\]");

--- a/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
@@ -319,7 +319,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
            LambdaUpdateWrapper<PlatSpace> platSpaceLambdaUpdateWrapper = Wrappers.lambdaUpdate(PlatSpace.class)
                    .set(PlatSpace::getAttribute, dto.getType())
                    .eq(PlatSpace::getOrgId, dto.getId())
-                    .set(PlatSpace::getParentId,dto.getParentId())
                    ;
            platSpaceService.update(platSpaceLambdaUpdateWrapper);
        }
@@ -405,7 +404,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
    public List<PlatOrg> belongToOrgTree(PlatOrg param) {
        PlatUserVO userVOCanNull = PlatUserUtil.getUserVOCanNull();
        String isTenant = userVOCanNull.getIsTenant();
-        //如果是租户账号 则有所有权限
+        //如果是租户账号 则有所有权限 返回最顶级
        if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
            List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
                    .eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())
@@ -414,7 +413,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
            return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));
        }
-        //平台账号
+        //平台账号 查询权限范围 生成不一定连续的树结构
        Set<String> orgIdList = getOrgIdListByUserId(userVOCanNull.getId());
        List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
                .eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())