代码调整

db/space.sql

@@ -86,8 +86,8 @@ CREATE TABLE `plat_region_setting`
     `install_type`        char(1) DEFAULT NULL COMMENT '安装方式 0-顶装 1-侧装',
     `install_type`        char(1) DEFAULT NULL COMMENT '安装方式 0-顶装 1-侧装',
     `toward`              char(1) DEFAULT NULL COMMENT '设备朝向 0-上 1-下 2-左 3-右',
     `toward`              char(1) DEFAULT NULL COMMENT '设备朝向 0-上 1-下 2-左 3-右',
     `region_name`         varchar(64)  DEFAULT NULL COMMENT '区域名称',
     `region_name`         varchar(64)  DEFAULT NULL COMMENT '区域名称',
-    `region_range`        varchar(128)  DEFAULT NULL COMMENT '区域定位',
-    `room_range`          varchar(128)  DEFAULT NULL COMMENT '房间门定位',
+    `region_range`        varchar(500)  DEFAULT NULL COMMENT '区域定位',
+    `room_range`          varchar(500)  DEFAULT NULL COMMENT '房间门定位',
     `equipment_range`     varchar(128)  DEFAULT NULL COMMENT '设备定位',
     `equipment_range`     varchar(128)  DEFAULT NULL COMMENT '设备定位',
     `device_id`        varchar(64) DEFAULT NULL COMMENT '设备Id',
     `device_id`        varchar(64) DEFAULT NULL COMMENT '设备Id',
     `create_by`           varchar(64)                            DEFAULT NULL COMMENT '创建者',
     `create_by`           varchar(64)                            DEFAULT NULL COMMENT '创建者',

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderCenterWechatServiceImpl.java

@@ -70,7 +70,7 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
             homeVo.setElderNumber(0);
             homeVo.setElderNumber(0);
             return homeVo;
             return homeVo;
         }
         }
-        List<String> elderIds = elders.stream().map(PlatElder::getId).collect(Collectors.toList());
+//        List<String> elderIds = elders.stream().map(PlatElder::getId).collect(Collectors.toList());
         //获取父级的所有子级空间
         //获取父级的所有子级空间
         List<PlatSpace> spaces = platSpaceService.listChild(Arrays.asList(dto.getSpaceId()));
         List<PlatSpace> spaces = platSpaceService.listChild(Arrays.asList(dto.getSpaceId()));
         List<String> spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
         List<String> spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
@@ -84,7 +84,7 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
 
 
         WorkStationQueryDTO queryDTO = new WorkStationQueryDTO();
         WorkStationQueryDTO queryDTO = new WorkStationQueryDTO();
         queryDTO.setSpaceIds(spaceIds);
         queryDTO.setSpaceIds(spaceIds);
-        queryDTO.setElderIds(elderIds);
+//        queryDTO.setElderIds(elderIds);
         List<WorkStationHomeBedVO> list = platBedService.selectByCondition(queryDTO);
         List<WorkStationHomeBedVO> list = platBedService.selectByCondition(queryDTO);
 
 
         JoinUtil.joinSplit(list, platSpaceService, WorkStationHomeBedVO::getSpacePath, PlatSpace::getId, (e, l) -> {
         JoinUtil.joinSplit(list, platSpaceService, WorkStationHomeBedVO::getSpacePath, PlatSpace::getId, (e, l) -> {
@@ -124,7 +124,7 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
 
 
         );
         );
 
 
-        List<String> elderIds = elders.stream().map(PlatElder::getId).collect(Collectors.toList());
+//        List<String> elderIds = elders.stream().map(PlatElder::getId).collect(Collectors.toList());
         //获取父级的所有子级空间
         //获取父级的所有子级空间
         List<PlatSpace> spaces = platSpaceService.listChild(Arrays.asList(dto.getSpaceId()));
         List<PlatSpace> spaces = platSpaceService.listChild(Arrays.asList(dto.getSpaceId()));
         List<String> spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
         List<String> spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
@@ -136,7 +136,7 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
         );
         );
         WorkStationQueryDTO queryDTO = new WorkStationQueryDTO();
         WorkStationQueryDTO queryDTO = new WorkStationQueryDTO();
         queryDTO.setSpaceIds(spaceIds);
         queryDTO.setSpaceIds(spaceIds);
-        queryDTO.setElderIds(elderIds);
+//        queryDTO.setElderIds(elderIds);
         List<WorkStationInstitutionRoomVO> roomVOList = platRoomService.workStationList(queryDTO);
         List<WorkStationInstitutionRoomVO> roomVOList = platRoomService.workStationList(queryDTO);
         if (roomVOList.isEmpty()) {
         if (roomVOList.isEmpty()) {
             institutionRoomVO.setList(new ArrayList<>());
             institutionRoomVO.setList(new ArrayList<>());