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

server-common/src/main/java/com/makeit/utils/user/plat/PlatUserUtil.java

@@ -19,7 +19,7 @@ public class PlatUserUtil {
 
     public static boolean isSuper() {
         PlatUserVO userVO = PlatUserUtil.getUserVO();
-        return IsFactoryAccountEnum.YES.getValue().equals(userVO.getTenantId())
+        return IsFactoryAccountEnum.YES.getValue().equals(userVO.getIsTenant())
                 || IdConst.SUPER_ADMIN_ID.equals(userVO.getId());
     }
 

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

+package com.makeit.module.controller.space;
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
+import com.makeit.dto.platform.space.PlatRoomPanoramaDTO;
+import com.makeit.service.platform.space.PlatRoomDynamicService;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
+import com.makeit.vo.platform.space.PlatRoomPanoramaVO;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Api(tags = "房态管理")
+@RestController
+@RequestMapping("/plat/room/dynamic")
+public class PlatRoomDynamicController {
+
+    @Autowired
+    private PlatRoomDynamicService platRoomDynamicService;
+
+    @ApiOperation("房间全景")
+    @PostMapping("roomPanorama")
+    public ApiResponseEntity<List<PlatRoomPanoramaVO>> roomPanorama(@RequestBody PlatRoomPanoramaDTO dto) {
+        List<PlatRoomPanoramaVO> data = platRoomDynamicService.roomPanorama(dto);
+        return ApiResponseUtils.success(data);
+    }
+
+    @ApiOperation("床位全景")
+    @PostMapping("bedPanorama")
+    public ApiResponseEntity<List<PlatBedPanoramaVO>> bedPanorama(@RequestBody PlatBedPanoramaDTO dto) {
+        List<PlatBedPanoramaVO> data = platRoomDynamicService.bedPanorama(dto);
+        return ApiResponseUtils.success(data);
+    }
+
+    @ApiOperation("房间全景-下拉空间树")
+    @PostMapping("roomPanoramaTree")
+    public ApiResponseEntity<List<PlatSpaceAndRoomVO>> roomPanoramaTree() {
+        List<PlatSpaceAndRoomVO> data = platRoomDynamicService.roomPanoramaTree();
+        return ApiResponseUtils.success(data);
+    }
+
+    @ApiOperation("床位全景-下拉空间树")
+    @PostMapping("bedPanoramaTree")
+    public ApiResponseEntity<List<PlatSpaceAndRoomVO>> bedPanoramaTree() {
+        List<PlatSpaceAndRoomVO> data = platRoomDynamicService.bedPanoramaTree();
+        return ApiResponseUtils.success(data);
+    }
+
+}

server-service/src/main/java/com/makeit/dto/platform/space/PlatBedPanoramaDTO.java

+package com.makeit.dto.platform.space;
+
+import com.makeit.enums.platform.space.PlatBedStatusEnum;
+import com.makeit.enums.platform.space.PlatSpaceEnum;
+import com.makeit.global.validator.DictEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Data
+@ApiModel("PlatBedPanoramaDTO参数")
+public class PlatBedPanoramaDTO {
+
+    @ApiModelProperty("空间/房间id")
+    private String id;
+
+    @ApiModelProperty("类型 1-空间 2-房间")
+    private String type;
+
+    @DictEnum(em = PlatBedStatusEnum.BedStatusEnum.class, message = "状态可选值为{m}")
+    @ApiModelProperty("状态 1-空闲 2-已入住")
+    private String status;
+}

server-service/src/main/java/com/makeit/dto/platform/space/PlatRoomPanoramaDTO.java

+package com.makeit.dto.platform.space;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Data
+@ApiModel("PlatRoomPanoramaDTO参数")
+public class PlatRoomPanoramaDTO {
+
+    @ApiModelProperty("空间id")
+    private String id;
+}

server-service/src/main/java/com/makeit/enums/platform/space/PlatBedPanoramaSpaceType.java

+package com.makeit.enums.platform.space;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+public class PlatBedPanoramaSpaceType {
+    public enum BedPanoramaSpaceType implements BaseEnum {
+
+        SPACE("bedPanorama.space.type.space"),
+        ROOM("bedPanorama.space.type.room");
+
+        private String code;
+
+        BedPanoramaSpaceType(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+}

server-service/src/main/java/com/makeit/enums/platform/space/PlatBedStatusEnum.java

+package com.makeit.enums.platform.space;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+public class PlatBedStatusEnum {
+    public enum BedStatusEnum implements BaseEnum {
+
+
+        //SPARE  空闲
+        //NOT_FULL 未住满
+        //FULL  已住满
+
+        SPARE("room.status.spare"),
+        CHECKED_IN("bed.status.CheckedIn");
+
+        private String code;
+
+        BedStatusEnum(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+}

server-service/src/main/java/com/makeit/enums/platform/space/PlatRoomStatusEnum.java

+package com.makeit.enums.platform.space;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+public class PlatRoomStatusEnum {
+    public enum RoomStatusEnum implements BaseEnum {
+
+
+        //SPARE  空闲
+        //NOT_FULL 未住满
+        //FULL  已住满
+
+        SPARE("room.status.spare"),
+        NOT_FULL("room.status.notFull"),
+        FULL("room.status.full");
+
+        private String code;
+
+        RoomStatusEnum(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+}

server-service/src/main/java/com/makeit/mapper/platform/space/PlatBedMapper.java

 package com.makeit.mapper.platform.space;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
 import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Author：lzy
@@ -9,4 +14,7 @@ import com.makeit.entity.platform.space.PlatBed;
  * @Describe：
  */
 public interface PlatBedMapper extends BaseMapper<PlatBed> {
+    List<PlatBedPanoramaVO> selectBySpaceIdAndStatus(@Param("dto") PlatBedPanoramaDTO dto);
+
+    List<PlatBedPanoramaVO> selectByRoomIdAndStatus(@Param("dto")PlatBedPanoramaDTO dto);
 }

server-service/src/main/java/com/makeit/mapper/platform/space/PlatRoomMapper.java

 package com.makeit.mapper.platform.space;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.dto.platform.space.PlatSpaceQueryDTO;
 import com.makeit.entity.platform.space.PlatRoom;
+import com.makeit.vo.platform.space.PlatRoomVO;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Author：lzy
@@ -9,4 +15,5 @@ import com.makeit.entity.platform.space.PlatRoom;
  * @Describe：
  */
 public interface PlatRoomMapper extends BaseMapper<PlatRoom> {
+    List<PlatSpaceAndRoomVO> spaceAndRoomList();
 }

server-service/src/main/java/com/makeit/mapper/platform/space/PlatSpaceMapper.java

 package com.makeit.mapper.platform.space;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.dto.platform.space.PlatSpaceQueryDTO;
 import com.makeit.entity.platform.space.PlatSpace;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
+
+import java.util.List;
 
 /**
  * @Author：lzy
@@ -9,4 +13,6 @@ import com.makeit.entity.platform.space.PlatSpace;
  * @Describe：
  */
 public interface PlatSpaceMapper extends BaseMapper<PlatSpace> {
+
+    List<PlatSpaceAndRoomVO> spaceListExcludeLast();
 }

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

@@ -5,6 +5,7 @@ import com.makeit.common.dto.StatusDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigDTOVO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigQueryDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.vo.platform.alarm.PlatAlarmConfigListVO;
 
 import java.util.List;
@@ -35,4 +36,6 @@ public interface PlatAlarmConfigService extends IService<PlatAlarmConfig> {
 
     void audit(StatusDTO dto);
 
+    void copyForOrg(PlatOrg org);
+
 }

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

@@ -9,18 +9,16 @@ import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 
 /**
-* @author lixl
-* @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service
-* @createDate 2023-09-06 14:26:05
-*/
+ * @author lixl
+ * @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service
+ * @createDate 2023-09-06 14:26:05
+ */
 public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 
     PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
 
     /**
      * 子女端告警列表
-     * @param dto
-     * @return
      */
     PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
 
@@ -28,11 +26,30 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 
     void deal(String recordId);
 
+    /**
+     * 通知家属
+     * @param recordId
+     */
     void noticeRelation(String recordId);
 
+    /**
+     * 通知家属
+     * 子女端小程序
+     * 短信
+     * 语音短信
+     */
     void noticeChildren(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 
-    void noticeUser(PlatAlarmConfig alarmConfig,PlatAlarmRecord alarmRecord);
+    /**
+     * 通知工作人员
+     * 短信
+     * 语音短信
+     * 邮件
+     */
+    void noticeUser(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 
-    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig,PlatAlarmRecord alarmRecord);
+    /**
+     * 设备告警调用 发送消息
+     */
+    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 }

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

@@ -6,17 +6,25 @@ import com.makeit.common.dto.StatusDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigDTOVO;
 import com.makeit.dto.platform.alarm.PlatAlarmConfigQueryDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatUser;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
+import com.makeit.enums.id.IdConst;
 import com.makeit.exception.BusinessException;
+import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper;
+import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
+import com.makeit.module.system.entity.SysConfig;
+import com.makeit.module.system.entity.SysConfigCategory;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.auth.PlatUserService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.StreamUtil;
+import com.makeit.utils.data.validate.MapUtil;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.sql.join.JoinUtil;
+import com.makeit.utils.user.plat.PlatUserVO;
 import com.makeit.vo.platform.alarm.PlatAlarmConfigListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
 
 /**
  * <p>
@@ -86,7 +96,7 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
     @Override
     @Transactional
     public void edit(PlatAlarmConfigDTOVO dto) {
-        updateById(BeanDtoVoUtils.convert(dto,PlatAlarmConfig.class));
+        updateById(BeanDtoVoUtils.convert(dto, PlatAlarmConfig.class));
     }
 
     @Override
@@ -154,5 +164,35 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
         updateById(alarmConfig);
     }
 
+    @Transactional
+    @Override
+    public void copyForOrg(PlatOrg org) {
+        List<PlatAlarmConfig> configList = TenantIdUtil.execute(IdConst.DEFAULT_TENANT_ID, () -> list());
+
+        List<BiConsumer<PlatAlarmConfig, String>> list = Arrays.asList(
+                PlatAlarmConfig::setCityOrgId,
+                PlatAlarmConfig::setDistrictOrgId,
+                PlatAlarmConfig::setStreetOrgId
+        );
+
+        String orgPath = org.getPath() + "," + org.getId();
+
+        String[] split = orgPath.split(",");
+
+        configList.forEach(e -> {
+            e.setId(null);
+
+            for (int i = 1; i < split.length; i++) {
+                BiConsumer<PlatAlarmConfig, String> consumer = list.get(i - 1);
+                consumer.accept(e, split[i]);
+            }
+
+            e.setOrgId(org.getId());
+            e.setOrgPath(orgPath);
+
+        });
+
+        saveBatch(configList);
+    }
 
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
+import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
@@ -17,6 +18,7 @@ import com.makeit.enums.CommonEnum;
 import com.makeit.enums.id.TreeConst;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.auth.PlatOrgMapper;
+import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatRoleOrgService;
 import com.makeit.service.platform.auth.PlatRoleService;
@@ -65,6 +67,9 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     @Autowired
     private PlatRoleService platRoleService;
 
+    @Autowired
+    private PlatAlarmConfigService platAlarmConfigService;
+
     @Override
     public List<PlatOrg> filter(List<PlatOrg> deptList, PlatOrgQueryDTO dto) {
         return new HashSet<>(deptList).stream()
@@ -521,5 +526,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     public void saveOrg(PlatOrg platOrg) {
 
         save(platOrg);
+
+        platAlarmConfigService.copyForOrg(platOrg);
     }
 }

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

@@ -8,6 +8,7 @@ import com.makeit.dto.platform.device.PlatDeviceDTO;
 import com.makeit.dto.platform.space.*;
 import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.entity.platform.space.PlatRoom;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
 
 import java.util.List;
 
@@ -53,4 +54,7 @@ public interface PlatBedService extends IService<PlatBed> {
     void changeStatus(StatusDTO dto);
 
 
+    List<PlatBedPanoramaVO> selectBySpaceIdAndStatus(PlatBedPanoramaDTO dto);
+
+    List<PlatBedPanoramaVO> selectByRoomIdAndStatus(PlatBedPanoramaDTO dto);
 }

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

+package com.makeit.service.platform.space;
+
+import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
+import com.makeit.dto.platform.space.PlatRoomPanoramaDTO;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
+import com.makeit.vo.platform.space.PlatRoomPanoramaVO;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
+
+import java.util.List;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+public interface PlatRoomDynamicService {
+    List<PlatRoomPanoramaVO> roomPanorama(PlatRoomPanoramaDTO dto);
+
+    List<PlatBedPanoramaVO> bedPanorama(PlatBedPanoramaDTO dto);
+
+    List<PlatSpaceAndRoomVO> roomPanoramaTree();
+
+    List<PlatSpaceAndRoomVO> bedPanoramaTree();
+
+}

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

@@ -6,7 +6,9 @@ import com.makeit.common.page.PageVO;
 import com.makeit.dto.platform.elder.PlatElderQueryDTO;
 import com.makeit.dto.platform.space.PlatRoomDTO;
 import com.makeit.dto.platform.space.PlatRoomQueryDTO;
+import com.makeit.dto.platform.space.PlatSpaceQueryDTO;
 import com.makeit.entity.platform.space.PlatRoom;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
 
 import java.util.List;
 
@@ -57,4 +59,6 @@ public interface PlatRoomService extends IService<PlatRoom> {
      * @return
      */
     PageVO<PlatRoom> page(PageReqDTO<PlatRoomQueryDTO> page);
+
+    List<PlatSpaceAndRoomVO> spaceAndRoomList();
 }

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

@@ -5,6 +5,7 @@ import com.makeit.dto.platform.space.PlatSpaceAddDTO;
 import com.makeit.dto.platform.space.PlatSpaceQueryDTO;
 import com.makeit.dto.platform.space.PlatSpaceVO;
 import com.makeit.entity.platform.space.PlatSpace;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
 
 import java.util.List;
 
@@ -46,4 +47,6 @@ public interface PlatSpaceService extends IService<PlatSpace> {
      * @return
      */
     PlatSpaceAddDTO view(String id);
+
+    List<PlatSpaceAndRoomVO> spaceListExcludeLast();
 }

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

@@ -22,6 +22,7 @@ import com.makeit.service.platform.space.PlatBedService;
 import com.makeit.service.platform.space.PlatRoomBedDeviceService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -146,5 +147,15 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
         updateById(bed);
     }
 
+    @Override
+    public List<PlatBedPanoramaVO> selectBySpaceIdAndStatus(PlatBedPanoramaDTO dto) {
+        return baseMapper.selectBySpaceIdAndStatus(dto);
+    }
+
+    @Override
+    public List<PlatBedPanoramaVO> selectByRoomIdAndStatus(PlatBedPanoramaDTO dto) {
+        return baseMapper.selectByRoomIdAndStatus(dto);
+    }
+
 
 }

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

+package com.makeit.service.platform.space.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
+import com.makeit.dto.platform.space.PlatRoomPanoramaDTO;
+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.platform.space.PlatBedPanoramaSpaceType;
+import com.makeit.enums.platform.space.PlatRoomStatusEnum;
+import com.makeit.mapper.platform.space.PlatBedMapper;
+import com.makeit.mapper.platform.space.PlatRoomMapper;
+import com.makeit.mapper.platform.space.PlatSpaceMapper;
+import com.makeit.service.platform.space.PlatBedService;
+import com.makeit.service.platform.space.PlatRoomDynamicService;
+import com.makeit.service.platform.space.PlatRoomService;
+import com.makeit.service.platform.space.PlatSpaceService;
+import com.makeit.vo.platform.space.PlatBedPanoramaVO;
+import com.makeit.vo.platform.space.PlatRoomPanoramaVO;
+import com.makeit.vo.platform.space.PlatRoomVO;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
+import jodd.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Service
+public class PlatRoomDynamicServiceImpl implements PlatRoomDynamicService {
+    @Autowired
+    private PlatSpaceService platSpaceService;
+    @Autowired
+    private PlatRoomService platRoomService;
+    @Autowired
+    private PlatBedService platBedService;
+
+
+    @Override
+    public List<PlatRoomPanoramaVO> roomPanorama(PlatRoomPanoramaDTO dto) {
+        List<PlatRoomPanoramaVO> list = new ArrayList<>();
+        //获取下级空间
+        List<PlatSpace> spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
+                .eq(PlatSpace::getParentId,dto.getId()));
+        if(!spaces.isEmpty()){
+            List<String> spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
+            //空间下的房间
+            List<PlatRoom> rooms = platRoomService.list(new QueryWrapper<PlatRoom>().lambda()
+                    .in(PlatRoom::getSpaceId,spaceIds));
+            List<String> roomIds = rooms.stream().map(PlatRoom::getId).collect(Collectors.toList());
+            List<PlatBed> beds = platBedService.list(new QueryWrapper<PlatBed>().lambda()
+                    .in(PlatBed::getRoomId,roomIds));
+            Map<String,List<PlatBed>> bedMap = beds.stream().collect(Collectors.groupingBy(PlatBed::getRoomId));
+            for(PlatSpace space : spaces){
+                PlatRoomPanoramaVO platRoomPanoramaVO = new PlatRoomPanoramaVO();
+                platRoomPanoramaVO.setSpaceName(space.getName());
+                platRoomPanoramaVO.setSpaceId(dto.getId());
+                List<PlatRoomVO> roomVOList = new ArrayList<>();
+                for(PlatRoom room : rooms){
+                    PlatRoomVO vo = convertToVO(room,bedMap);
+                    roomVOList.add(vo);
+                }
+                platRoomPanoramaVO.setList(roomVOList);
+                list.add(platRoomPanoramaVO);
+            }
+        }
+
+        return list;
+    }
+
+    private PlatRoomVO convertToVO(PlatRoom room, Map<String, List<PlatBed>> bedMap) {
+        PlatRoomVO vo = new PlatRoomVO();
+        vo.setBedNumber(room.getBedNumber());
+        vo.setRoomName(room.getName());
+        vo.setRoomId(room.getId());
+        if(bedMap.get(room.getId())!=null){
+            vo.setUsedTotal(bedMap.get(room.getId()).size());
+        }else {
+            vo.setUsedTotal(0);
+        }
+        if(vo.getUsedTotal()==0){
+            vo.setRoomStatus(PlatRoomStatusEnum.RoomStatusEnum.SPARE.getValue());
+        }else if(vo.getUsedTotal() < vo.getBedNumber()){
+            vo.setRoomStatus(PlatRoomStatusEnum.RoomStatusEnum.NOT_FULL.getValue());
+        }else {
+            vo.setRoomStatus(PlatRoomStatusEnum.RoomStatusEnum.FULL.getValue());
+        }
+        return vo;
+    }
+
+    @Override
+    public List<PlatBedPanoramaVO> bedPanorama(PlatBedPanoramaDTO dto) {
+        List<PlatBedPanoramaVO> list = new ArrayList<>();
+        if(PlatBedPanoramaSpaceType.BedPanoramaSpaceType.SPACE.getValue().equals(dto.getType())){
+            list = platBedService.selectBySpaceIdAndStatus(dto);
+        }else if(PlatBedPanoramaSpaceType.BedPanoramaSpaceType.ROOM.getValue().equals(dto.getType())){
+            list = platBedService.selectByRoomIdAndStatus(dto);
+        }
+        List<PlatSpace> spaces = platSpaceService.list();
+        Map<String,String> spaceNameMap = spaces.stream().collect(Collectors.toMap(PlatSpace::getId,PlatSpace::getName));
+        list.forEach(vo->{
+            String spacePathName = "";
+            if(StringUtil.isNotEmpty(vo.getSpacePath())){
+                List<String> spaceIds = Arrays.asList(vo.getSpacePath().split(","));
+                for(String spaceId : spaceIds){
+                    if(spaceNameMap.get(spaceId)!=null && StringUtil.isNotEmpty(spaceNameMap.get(spaceId))){
+                        spacePathName = "".equals(spacePathName) ? spaceNameMap.get(spaceId) : spacePathName + "-" + spaceNameMap.get(spaceId);
+                    }
+
+                }
+            }
+            if(StringUtil.isNotEmpty(vo.getRoomName())){
+                spacePathName = "".equals(spacePathName) ? vo.getRoomName() : spacePathName + "-" + vo.getRoomName();
+            }
+            if(StringUtil.isNotEmpty(vo.getBedName())){
+                spacePathName = "".equals(spacePathName) ? vo.getBedName() : spacePathName + "-" + vo.getBedName();
+            }
+            vo.setSpacePathName(spacePathName);
+        });
+
+        return list;
+    }
+
+    @Override
+    public List<PlatSpaceAndRoomVO> roomPanoramaTree() {
+        //获取房间前两级空间
+        List<PlatSpaceAndRoomVO> list = platSpaceService.spaceListExcludeLast();
+        //父级
+        List<PlatSpaceAndRoomVO> listParent = list.stream().filter(item-> StringUtil.isEmpty(item.getParentId())).collect(Collectors.toList());
+
+        //子集
+        List<PlatSpaceAndRoomVO> listChild = list.stream().filter(item->item.getParentId() != null).collect(Collectors.toList());
+        Map<String,List<PlatSpaceAndRoomVO>> map = listChild.stream().collect(Collectors.groupingBy(PlatSpaceAndRoomVO::getParentId));
+
+        List<PlatSpaceAndRoomVO> data = new ArrayList<>();
+        for(PlatSpaceAndRoomVO space:listParent){
+            space = child(space,map);
+            data.add(space);
+        }
+        return data;
+    }
+
+    @Override
+    public List<PlatSpaceAndRoomVO> bedPanoramaTree() {
+        //获取空间及房间
+        List<PlatSpaceAndRoomVO> list = platRoomService.spaceAndRoomList();
+        //父级
+        List<PlatSpaceAndRoomVO> listParent = list.stream().filter(item-> StringUtil.isEmpty(item.getParentId())).collect(Collectors.toList());
+
+        //子集
+        List<PlatSpaceAndRoomVO> listChild = list.stream().filter(item->item.getParentId() != null).collect(Collectors.toList());
+        Map<String,List<PlatSpaceAndRoomVO>> map = listChild.stream().collect(Collectors.groupingBy(PlatSpaceAndRoomVO::getParentId));
+
+        List<PlatSpaceAndRoomVO> data = new ArrayList<>();
+        for(PlatSpaceAndRoomVO space:listParent){
+            space = child(space,map);
+            data.add(space);
+        }
+        return data;
+    }
+
+    private PlatSpaceAndRoomVO child(PlatSpaceAndRoomVO vo,Map<String,List<PlatSpaceAndRoomVO>> map){
+
+        if(!map.containsKey(vo.getId())){
+            return vo;
+        }
+
+        List<PlatSpaceAndRoomVO> list = map.get(vo.getId());
+        List<PlatSpaceAndRoomVO> listChild = new ArrayList<>();
+        for(PlatSpaceAndRoomVO item:list){
+            this.child(item,map);
+            listChild.add(item);
+        }
+        vo.setChild(listChild);
+        return vo;
+    }
+}

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

@@ -17,6 +17,7 @@ import com.makeit.service.platform.space.PlatBedService;
 import com.makeit.service.platform.space.PlatRoomService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -123,5 +124,10 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
         return PageUtil.toPageVO(pages.getRecords(), pages);
     }
 
+    @Override
+    public List<PlatSpaceAndRoomVO> spaceAndRoomList() {
+        return baseMapper.spaceAndRoomList();
+    }
+
 
 }

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

@@ -13,6 +13,7 @@ import com.makeit.mapper.platform.space.PlatSpaceMapper;
 import com.makeit.service.platform.space.PlatRoomService;
 import com.makeit.service.platform.space.PlatSpaceService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
+import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -124,6 +125,11 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
         return data;
     }
 
+    @Override
+    public List<PlatSpaceAndRoomVO> spaceListExcludeLast() {
+        return baseMapper.spaceListExcludeLast();
+    }
+
     private PlatSpaceVO child(PlatSpaceVO vo,Map<String,List<PlatSpace>> map){
 
         if(!map.containsKey(vo.getId())){

server-service/src/main/java/com/makeit/vo/platform/space/PlatBedPanoramaVO.java

+package com.makeit.vo.platform.space;
+
+import com.makeit.common.dto.BaseIdDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Data
+@ApiModel("PlatBedPanoramaVO参数")
+public class PlatBedPanoramaVO extends BaseIdDTO {
+
+    @ApiModelProperty("空间全路径id")
+    private String spacePath;
+
+    @ApiModelProperty("全路径名称")
+    private String spacePathName;
+
+    @ApiModelProperty("房间名称")
+    private String roomName;
+
+    @ApiModelProperty("床位名称")
+    private String bedName;
+
+    @ApiModelProperty("是否空闲 1 是 0 否")
+    private String status;
+
+    @ApiModelProperty("长者id")
+    private String elderId;
+
+    @ApiModelProperty("长者姓名")
+    private String elderName;
+
+}

server-service/src/main/java/com/makeit/vo/platform/space/PlatRoomPanoramaVO.java

+package com.makeit.vo.platform.space;
+
+import com.makeit.common.dto.BaseIdDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/6
+ */
+@Data
+@ApiModel("PlatRoomPanoramaVO参数")
+public class PlatRoomPanoramaVO{
+
+    @ApiModelProperty("空间名称")
+    private String spaceName;
+
+    @ApiModelProperty("空间id")
+    private String spaceId;
+
+    private List<PlatRoomVO> list;
+}

server-service/src/main/java/com/makeit/vo/platform/space/PlatRoomVO.java

+package com.makeit.vo.platform.space;
+
+import com.makeit.common.dto.BaseIdDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/8
+ */
+@Data
+@ApiModel("PlatRoomVO参数")
+public class PlatRoomVO {
+
+    @ApiModelProperty("房间名称")
+    private String roomName;
+
+    @ApiModelProperty("房间床位总数")
+    private Integer bedNumber;
+
+    @ApiModelProperty("房间id")
+    private String roomId;
+
+    @ApiModelProperty("房间床位使用数")
+    private Integer usedTotal;
+
+    @ApiModelProperty("状态")
+    private String roomStatus;
+
+}

server-service/src/main/java/com/makeit/vo/platform/space/PlatSpaceAndRoomVO.java

+package com.makeit.vo.platform.space;
+
+import com.makeit.common.dto.BaseIdDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Controller
+ *
+ * @author zm
+ * @version 2023/9/6
+ */
+@Data
+@ApiModel("PlatSpaceVO参数")
+public class PlatSpaceAndRoomVO extends BaseIdDTO {
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("父级Id")
+    private String parentId;
+
+    @ApiModelProperty("类型 0-空间 1-房间")
+    private String type;
+
+    @ApiModelProperty("子集")
+    private List<PlatSpaceAndRoomVO> child;
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.makeit.mapper.platform.space.PlatBedMapper">
+    <select id="selectBySpaceIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
+        SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
+        FROM `plat_bed` pb
+        LEFT JOIN plat_room pm on pb.room_id = pm.id
+        LEFT JOIN plat_elder pe on pe.bed_id = pb.id
+        <where>
+            pb.del_flag = 0
+            <if test="dto.id != null and dto.id != ''">
+                AND FIND_IN_SET(#{dto.id},pm.space_path)
+            </if>
+            <if test="dto.status != null and dto.status != ''">
+                AND pb.statue = #{dto.status}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectByRoomIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
+        SELECT pb.id,pb.`status`,pb.name bedName ,pm.`name` roomName,pm.space_path,pe.name as elderName,pe.id as elderId
+        FROM `plat_bed` pb
+        LEFT JOIN plat_room pm on pb.room_id = pm.id
+        LEFT JOIN plat_elder pe on pe.bed_id = pb.id
+        <where>
+            pb.del_flag = 0
+            AND pm.id = #{dto.id}
+            <if test="dto.status != null and dto.status != ''">
+                AND pb.statue = #{dto.status}
+            </if>
+        </where>
+    </select>
+
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.makeit.mapper.platform.space.PlatRoomMapper">
+    <select id="spaceAndRoomList" resultType="com.makeit.vo.platform.space.PlatSpaceAndRoomVO">
+        SELECT ps.id,ps.`name`,ps.parent_id as parentId,'0' as type FROM plat_space ps
+        WHERE ps.del_flag = 0
+        UNION
+        SELECT pr.id,pr.`name`,pr.space_id as parentId,'1' as type FROM plat_room pr
+        WHERE pr.del_flag = 0
+    </select>
+
+
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.makeit.mapper.platform.space.PlatSpaceMapper">
+    <select id="spaceListExcludeLast" resultType="com.makeit.vo.platform.space.PlatSpaceAndRoomVO">
+        SELECT ps.id,ps.`name`,ps.parent_id as parentId FROM plat_space ps
+        WHERE ps.id in (SELECT parent_id FROM `plat_space` WHERE del_flag =0) and ps.del_flag = 0
+    </select>
+
+
+
+</mapper>