告警配置更改

server-common/src/main/java/com/makeit/utils/data/convert/StreamUtil.java

@@ -156,4 +156,8 @@ public class StreamUtil {
         return list.stream().map(function).collect(Collectors.joining(","));
         return list.stream().map(function).collect(Collectors.joining(","));
     }
     }
 
 
+    public static <T> String join(List<T> list, Predicate<T> predicate, Function<T, String> function) {
+        return list.stream().filter(predicate).map(function).collect(Collectors.joining(","));
+    }
+
 }
 }

server-common/src/main/java/com/makeit/utils/sql/join/JoinUtil.java

@@ -50,6 +50,10 @@ public class JoinUtil {
         join(list, service, null, getNidList, getMid, consumerList);
         join(list, service, null, getNidList, getMid, consumerList);
     }
     }
 
 
+    public static <T, M extends BaseEntity> void join(List<T> list, IService<M> service, List<Function<T, String>> getNidList, List<BiConsumer<T, M>> consumerList) {
+        join(list, service, null, getNidList, BaseEntity::getId, consumerList);
+    }
+
     public static <T, M> void join(List<T> list, IService<M> service, Consumer<LambdaQueryWrapper<M>> extQuery, List<Function<T, String>> getNidList, SFunction<M, String> getMid, List<BiConsumer<T, M>> consumerList) {
     public static <T, M> void join(List<T> list, IService<M> service, Consumer<LambdaQueryWrapper<M>> extQuery, List<Function<T, String>> getNidList, SFunction<M, String> getMid, List<BiConsumer<T, M>> consumerList) {
         if (list.isEmpty()) {
         if (list.isEmpty()) {
             return;
             return;

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

@@ -18,15 +18,9 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value = "PlatAlarmConfig对象", description = "告警配置")
 @ApiModel(value = "PlatAlarmConfig对象", description = "告警配置")
 public class PlatAlarmConfigBehaviorDTOVO {
 public class PlatAlarmConfigBehaviorDTOVO {
 
 
-    @ApiModelProperty("心率正常范围开始")
-    private Integer heartRateStart;
 
 
-    @ApiModelProperty("心率正常范围结束")
-    private Integer heartRateEnd;
-
-    @ApiModelProperty("异常持续时间")
+    @ApiModelProperty("平均停留时长允许范围")
     private Integer duration;
     private Integer duration;
 
 
 
 
-
 }
 }

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

@@ -22,7 +22,7 @@ public class PlatAlarmConfigHeartDTOVO {
     private Integer heartRateStart;
     private Integer heartRateStart;
 
 
     @ApiModelProperty("心率正常范围结束")
     @ApiModelProperty("心率正常范围结束")
-    private Integer heartRateeEnd;
+    private Integer heartRateEnd;
 
 
     @ApiModelProperty("异常持续时间")
     @ApiModelProperty("异常持续时间")
     private Integer duration;
     private Integer duration;

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

 package com.makeit.dto.platform.alarm;
 package com.makeit.dto.platform.alarm;
 
 
-import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

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

@@ -12,12 +12,18 @@ import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderHealthInfo;
 import com.makeit.entity.platform.elder.PlatElderHealthInfo;
 import com.makeit.entity.platform.elder.PlatElderOtherInfo;
 import com.makeit.entity.platform.elder.PlatElderOtherInfo;
 import com.makeit.entity.platform.elder.PlatElderSocialRelation;
 import com.makeit.entity.platform.elder.PlatElderSocialRelation;
+import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.entity.platform.space.PlatRoom;
+import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.FileSuffixEnum;
 import com.makeit.enums.FileSuffixEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.elder.PlatElderMapper;
 import com.makeit.mapper.platform.elder.PlatElderMapper;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.*;
 import com.makeit.service.platform.elder.*;
+import com.makeit.service.platform.space.PlatBedService;
+import com.makeit.service.platform.space.PlatRoomService;
+import com.makeit.service.platform.space.PlatSpaceService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.convert.StreamUtil;
@@ -65,6 +71,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     @Autowired
     @Autowired
     private PlatOrgService platOrgService;
     private PlatOrgService platOrgService;
 
 
+    @Autowired
+    private PlatSpaceService platSpaceService;
+
+    @Autowired
+    private PlatRoomService platRoomService;
+
+    @Autowired
+    private PlatBedService platBedService;
+
     private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
     private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
         return new QueryWrapper<PlatElder>().lambda()
         return new QueryWrapper<PlatElder>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
@@ -93,6 +108,40 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             d.setOrgName(StreamUtil.join(o, PlatOrg::getName));
             d.setOrgName(StreamUtil.join(o, PlatOrg::getName));
         });
         });
 
 
+        JoinUtil.joinSplit(list, platSpaceService, PlatElderListVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(StreamUtil.join(l, Objects::nonNull, PlatSpace::getName));
+        });
+
+        JoinUtil.joinSplit(list, platRoomService, PlatElderListVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatRoom::getName));
+        });
+
+        JoinUtil.joinSplit(list, platBedService, PlatElderListVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatBed::getName));
+        });
+
+        JoinUtil.join(list, platSpaceService, Arrays.asList(
+                PlatElderListVO::getSpaceId,
+                PlatElderListVO::getStreetSpaceId,
+                PlatElderListVO::getBuildingSpaceId,
+                PlatElderListVO::getUnitSpaceId,
+                PlatElderListVO::getFloorSpaceId
+        ), Arrays.asList(
+                (e, s) -> e.setSpaceName(s.getName()),
+                (e, s) -> e.setStreetSpaceName(s.getName()),
+                (e, s) -> e.setBuildingSpaceName(s.getName()),
+                (e, s) -> e.setUnitSpaceName(s.getName()),
+                (e, s) -> e.setFloorSpaceName(s.getName())
+        ));
+
+        JoinUtil.join(list, platRoomService, PlatElderListVO::getRoomId, (e, l) -> {
+            e.setRoomName(l.getName());
+        });
+
+        JoinUtil.join(list, platBedService, PlatElderListVO::getBedId, (e, l) -> {
+            e.setBedName(l.getName());
+        });
+
         return PageUtil.toPageVO(list, voPage);
         return PageUtil.toPageVO(list, voPage);
 
 
     }
     }
@@ -223,6 +272,43 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         vo.setOtherInfo(otherInfo);
         vo.setOtherInfo(otherInfo);
 
 
+        List<PlatElderDTOVO> list = Arrays.asList(vo);
+
+
+        JoinUtil.joinSplit(list, platSpaceService, PlatElderDTOVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(StreamUtil.join(l, Objects::nonNull, PlatSpace::getName));
+        });
+
+        JoinUtil.joinSplit(list, platRoomService, PlatElderDTOVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatRoom::getName));
+        });
+
+        JoinUtil.joinSplit(list, platBedService, PlatElderDTOVO::getSpacePath, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatBed::getName));
+        });
+
+        JoinUtil.join(list, platSpaceService, Arrays.asList(
+                PlatElderDTOVO::getSpaceId,
+                PlatElderDTOVO::getStreetSpaceId,
+                PlatElderDTOVO::getBuildingSpaceId,
+                PlatElderDTOVO::getUnitSpaceId,
+                PlatElderDTOVO::getFloorSpaceId
+        ), Arrays.asList(
+                (e, s) -> e.setSpaceName(s.getName()),
+                (e, s) -> e.setStreetSpaceName(s.getName()),
+                (e, s) -> e.setBuildingSpaceName(s.getName()),
+                (e, s) -> e.setUnitSpaceName(s.getName()),
+                (e, s) -> e.setFloorSpaceName(s.getName())
+        ));
+
+        JoinUtil.join(list, platRoomService, PlatElderDTOVO::getRoomId, (e, l) -> {
+            e.setRoomName(l.getName());
+        });
+
+        JoinUtil.join(list, platBedService, PlatElderDTOVO::getBedId, (e, l) -> {
+            e.setBedName(l.getName());
+        });
+
         return vo;
         return vo;
 
 
     }
     }

server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderListVO.java

@@ -42,6 +42,9 @@ public class PlatElderListVO extends BaseTenantDTO {
     private String phone;
     private String phone;
 
 
     @ApiModelProperty(value = "空间id")
     @ApiModelProperty(value = "空间id")
+    private String spaceId;
+
+    @ApiModelProperty(value = "空间名称")
     private String spaceName;
     private String spaceName;
 
 
     @ApiModelProperty(value = "小区/社区/街道空间id")
     @ApiModelProperty(value = "小区/社区/街道空间id")