子女端我的家庭列表

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

@@ -114,17 +114,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 .orderByDesc(PlatElder::getId);
                 .orderByDesc(PlatElder::getId);
     }
     }
 
 
-    @Override
-    public PageVO<PlatElderListVO> page(PageReqDTO<PlatElderQueryDTO> page) {
-        PlatElderQueryDTO dto = page.getData();
-        Page<PlatElder> p = PageUtil.toMpPage(page);
-
-        Page<PlatElder> voPage = page(p, lambdaQueryWrapper(dto));
-
-        List<PlatElder> voList = voPage.getRecords();
-
-        List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
-
+    private void fill(List<PlatElderListVO> list){
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
             d.setOrgName(o.getName());
             d.setOrgName(o.getName());
         });
         });
@@ -166,6 +156,20 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         JoinUtil.join(list, platBedService, PlatElderListVO::getBedId, PlatBed::getId, (e, l) -> {
         JoinUtil.join(list, platBedService, PlatElderListVO::getBedId, PlatBed::getId, (e, l) -> {
             e.setBedName(l.getName());
             e.setBedName(l.getName());
         });
         });
+    }
+
+    @Override
+    public PageVO<PlatElderListVO> page(PageReqDTO<PlatElderQueryDTO> page) {
+        PlatElderQueryDTO dto = page.getData();
+        Page<PlatElder> p = PageUtil.toMpPage(page);
+
+        Page<PlatElder> voPage = page(p, lambdaQueryWrapper(dto));
+
+        List<PlatElder> voList = voPage.getRecords();
+
+        List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
+
+        fill(list);
 
 
         return PageUtil.toPageVO(list, voPage);
         return PageUtil.toPageVO(list, voPage);
 
 
@@ -177,6 +181,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
         List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
 
 
+        fill(list);
+
         return list;
         return list;
     }
     }
 
 
@@ -918,6 +924,41 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         voList = Arrays.stream(childrenInfo.getElderId().split(",")).map(map::get).filter(Objects::nonNull).collect(Collectors.toList());
         voList = Arrays.stream(childrenInfo.getElderId().split(",")).map(map::get).filter(Objects::nonNull).collect(Collectors.toList());
 
 
+        JoinUtil.joinSplit(voList, platSpaceService, PlatElderWechatSimpleVO::getSpacePath, PlatSpace::getId, (e, l) -> {
+            e.setSpacePathName(StreamUtil.join(l, Objects::nonNull, PlatSpace::getName));
+        });
+
+        JoinUtil.joinSplit(voList, platRoomService, PlatElderWechatSimpleVO::getSpacePath, PlatRoom::getId, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatRoom::getName));
+        });
+
+        JoinUtil.joinSplit(voList, platBedService, PlatElderWechatSimpleVO::getSpacePath, PlatBed::getId, (e, l) -> {
+            e.setSpacePathName(e.getSpacePathName() + "," + StreamUtil.join(l, Objects::nonNull, PlatBed::getName));
+        });
+
+        JoinUtil.join(voList, platSpaceService, Arrays.asList(
+                PlatElderWechatSimpleVO::getSpaceId,
+                PlatElderWechatSimpleVO::getStreetSpaceId,
+                PlatElderWechatSimpleVO::getBuildingSpaceId,
+                PlatElderWechatSimpleVO::getUnitSpaceId,
+                PlatElderWechatSimpleVO::getFloorSpaceId
+        ), PlatSpace::getId, 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(voList, platRoomService, PlatElderWechatSimpleVO::getRoomId, PlatRoom::getId, (e, l) -> {
+            e.setRoomName(l.getName());
+        });
+
+        JoinUtil.join(voList, platBedService, PlatElderWechatSimpleVO::getBedId, PlatBed::getId, (e, l) -> {
+            e.setBedName(l.getName());
+        });
+
+
         return voList;
         return voList;
 
 
     }
     }

server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderWechatSimpleVO.java

@@ -68,9 +68,57 @@ public class PlatElderWechatSimpleVO extends BaseTenantDTO {
     private String avatarPath;
     private String avatarPath;
 
 
 
 
-
-
     @ApiModelProperty(value = "家庭地址详细")
     @ApiModelProperty(value = "家庭地址详细")
     private String homeAddressDetail;
     private String homeAddressDetail;
 
 
+
+    @ApiModelProperty(value = "空间id")
+    private String spaceId;
+
+    @ApiModelProperty(value = "空间id")
+    private String spaceName;
+
+    @ApiModelProperty(value = "小区/社区/街道空间id")
+    private String streetSpaceId;
+
+    @ApiModelProperty(value = "小区/社区/街道空间名称")
+    private String streetSpaceName;
+
+    @ApiModelProperty(value = "楼栋空间id")
+    private String buildingSpaceId;
+
+    @ApiModelProperty(value = "楼栋空间名称")
+    private String buildingSpaceName;
+
+    @ApiModelProperty(value = "单元空间id")
+    private String unitSpaceId;
+
+    @ApiModelProperty(value = "单元空间名称")
+    private String unitSpaceName;
+
+    @ApiModelProperty(value = "楼层id")
+    private String floorSpaceId;
+
+    @ApiModelProperty(value = "楼层id")
+    private String floorSpaceName;
+
+    @ApiModelProperty(value = "房间id")
+    private String roomId;
+
+    @ApiModelProperty(value = "房间名称")
+    private String roomName;
+
+    @ApiModelProperty(value = "床位id")
+    private String bedId;
+
+    @ApiModelProperty(value = "床位名称")
+    private String bedName;
+
+    @ApiModelProperty(value = "空间-房间-床位路径")
+    private String spacePath;
+
+    @ApiModelProperty(value = "空间-房间-床位路径名称")
+    private String spacePathName;
+
+
 }
 }