Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -99,6 +99,8 @@ public enum CodeMessageEnum {
 
 
     PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"),
     PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"),
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),
+    PLATFORM_ERROR_SPACE_NOT_AUTH_PARENT(500, "PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT"),
+    PLATFORM_ERROR_SPACE_USER_NOT_ADD(500, "PLATFORM.ERROR.SPACE.USER.NOT.ADD"),
     PLATFORM_ERROR_ROOM_EXIT_BAD(500, "PLATFORM.ERROR.ROOM.EXIT.BAD"),
     PLATFORM_ERROR_ROOM_EXIT_BAD(500, "PLATFORM.ERROR.ROOM.EXIT.BAD"),
     PLATFORM_ERROR_ROOM_BAD_NUMBER_NOT_AUTH(500, "PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH"),
     PLATFORM_ERROR_ROOM_BAD_NUMBER_NOT_AUTH(500, "PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH"),
     PLATFORM_ERROR_ROOM_NAME_EXIT(500, "PLATFORM.ERROR.ROOM.NAME.EXIT"),
     PLATFORM_ERROR_ROOM_NAME_EXIT(500, "PLATFORM.ERROR.ROOM.NAME.EXIT"),

server-common/src/main/resources/locale/business_messages.properties

@@ -94,6 +94,8 @@ PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复
 
 
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
+PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT=上级空间不能是自己的下级空间
+PLATFORM.ERROR.SPACE.USER.NOT.ADD=当前用户没有所属组织，请先分配组织
 PLATFORM.ERROR.ROOM.EXIT.BAD=房间中存在床位，不可删除
 PLATFORM.ERROR.ROOM.EXIT.BAD=房间中存在床位，不可删除
 PLATFORM.ERROR.ROOM.NAME.EXIT=该房间名称已存在
 PLATFORM.ERROR.ROOM.NAME.EXIT=该房间名称已存在
 PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH=床位数量不能改小
 PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH=床位数量不能改小

server-module/src/main/java/com/makeit/module/controller/wechat/space/PlatSpaceWechatController.java

@@ -75,4 +75,11 @@ public class PlatSpaceWechatController {
         return ApiResponseUtils.success(data);
         return ApiResponseUtils.success(data);
     }
     }
 
 
+    @ApiOperation("树-上级空间")
+    @PostMapping("parentListTree")
+    public ApiResponseEntity<List<PlatSpaceVO>> parentListTree(@RequestBody PlatSpaceQueryDTO dto) {
+        List<PlatSpaceVO> data = spaceService.parentListTree(dto);
+        return ApiResponseUtils.success(data);
+    }
+
 }
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -840,7 +840,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
     }
     }
 
 
     private void fillOrgPath(PlatPersonDTOVO dto, PlatUser user) {
     private void fillOrgPath(PlatPersonDTOVO dto, PlatUser user) {
-        PlatOrg platOrg = platOrgService.getById(dto.getId());
+        PlatOrg platOrg = platOrgService.getById(dto.getOrgId());
         if (platOrg != null) {
         if (platOrg != null) {
             user.setOrgPath(platOrg.getPath() + "," + platOrg.getId());
             user.setOrgPath(platOrg.getPath() + "," + platOrg.getId());
         }
         }

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java

@@ -77,6 +77,9 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
         PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class);
         PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class);
         if(StringUtil.isEmpty(dto.getParentId())){
         if(StringUtil.isEmpty(dto.getParentId())){
             PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
             PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
+            if(StringUtil.isEmpty(userVO.getOrgId())){
+                throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_USER_NOT_ADD);
+            }
             space.setOrgId(userVO.getOrgId());
             space.setOrgId(userVO.getOrgId());
             PlatOrg org = platOrgService.getById(space.getOrgId());
             PlatOrg org = platOrgService.getById(space.getOrgId());
             if(org!=null){
             if(org!=null){
@@ -105,6 +108,13 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
         space.setLongitude(dto.getLongitude());
         space.setLongitude(dto.getLongitude());
         space.setParentId(dto.getParentId());
         space.setParentId(dto.getParentId());
         space.setParentPath(dto.getParentPath());
         space.setParentPath(dto.getParentPath());
+
+        //上级空间
+        PlatSpace parentSpace = this.getById(dto.getParentId());
+        if(parentSpace.getParentPath().contains(dto.getId())){
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_NOT_DEL);
+        }
+
         this.updateById(space);
         this.updateById(space);
     }
     }
 
 
@@ -171,6 +181,8 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
     @Override
     @Override
     public List<PlatSpaceVO> treeByBed(PlatSpaceQueryDTO dto) {
     public List<PlatSpaceVO> treeByBed(PlatSpaceQueryDTO dto) {
 
 
+        PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
+
         //房间
         //房间
         List<PlatRoom> listRoom = platRoomService.list(new LambdaQueryWrapper<>());
         List<PlatRoom> listRoom = platRoomService.list(new LambdaQueryWrapper<>());
 
 
@@ -199,6 +211,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
 
 
         LambdaQueryWrapper<PlatSpace> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatSpace> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()),PlatSpace::getName,dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()),PlatSpace::getName,dto.getName());
+        queryWrapper.eq(StringUtil.isNotEmpty(userVO.getOrgId()),PlatSpace::getOrgId,userVO.getOrgId());
         List<PlatSpace> list = this.list(queryWrapper);
         List<PlatSpace> list = this.list(queryWrapper);
         List<PlatSpaceVO> listSpaceVo = BeanDtoVoUtils.listVo(list,PlatSpaceVO.class);
         List<PlatSpaceVO> listSpaceVo = BeanDtoVoUtils.listVo(list,PlatSpaceVO.class);
         listSpaceVo.addAll(listRoomVo);
         listSpaceVo.addAll(listRoomVo);

server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java

@@ -41,6 +41,12 @@ public class WorkStationHomeBedVO {
     @ApiModelProperty(value = "长者id")
     @ApiModelProperty(value = "长者id")
     private String elderId;
     private String elderId;
 
 
+    @ApiModelProperty(value = "头像文件id")
+    private String avatar;
+
+    @ApiModelProperty(value = "头像文件路径")
+    private String avatarPath;
+
     @ApiModelProperty(value = "长者姓名")
     @ApiModelProperty(value = "长者姓名")
     private String elderName;
     private String elderName;
 
 

server-service/src/main/resources/mappers/PlatBedMapper.xml

@@ -66,12 +66,13 @@
     </select>
     </select>
 
 
     <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
     <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
-        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status,pe.avatar,sf.url as avatarPath
         FROM plat_bed pb
         FROM plat_bed pb
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
+        LEFT JOIN sys_file sf ON sf.id = pe.avatar
         <where>
         <where>
             pb.del_flag = 0 and pb.status = 0
             pb.del_flag = 0 and pb.status = 0
             <if test="dto.elderName != null and dto.elderName != ''">
             <if test="dto.elderName != null and dto.elderName != ''">
@@ -122,12 +123,13 @@
     </select>
     </select>
 
 
     <select id="selectByConditionPage" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
     <select id="selectByConditionPage" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
-        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status
+        SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pe.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status,pe.avatar,sf.url as avatarPath
         FROM plat_bed pb
         FROM plat_bed pb
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_room pm ON pm.id = pb.room_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_space ps ON ps.id = pm.space_id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
         LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id and prbd.del_flag = 0
+        LEFT JOIN sys_file sf ON sf.id = pe.avatar
         <where>
         <where>
             pb.del_flag = 0 and pb.status = 0
             pb.del_flag = 0 and pb.status = 0
             <if test="dto.elderName != null and dto.elderName != ''">
             <if test="dto.elderName != null and dto.elderName != ''">