几个天从path的地方

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

 package com.makeit.utils.data.convert;
 
 import com.makeit.enums.id.TreeConst;
+import com.makeit.utils.old.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -85,4 +84,21 @@ public class TreeUtil {
         }
     }
 
+    public static String path(String path, List<String> idList) {
+
+//        if(StringUtils.isBlank(path)){
+//            return path;
+//        }
+
+
+        LinkedHashSet<String> list = new LinkedHashSet<>();
+        if (StringUtils.isNotBlank(path)) {
+            list = new LinkedHashSet<>(Arrays.asList(path.split(",")));
+        }
+
+        list.addAll(idList);
+
+        return StreamUtil.join(new ArrayList<>(list), Function.identity());
+    }
+
 }

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

@@ -33,7 +33,6 @@ public class PlatUserVO implements Serializable {
     private String orgPath;
 
 
-
     public PlatUserVO() {
     }
 
@@ -49,27 +48,25 @@ public class PlatUserVO implements Serializable {
     }
 
 
-
-
     private boolean initFlag = false;
 
 
-    public void init(){
-        if(initFlag){
+    public void init() {
+        if (initFlag) {
             return;
         }
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             return;
         }
-        List<BiConsumer<PlatUserVO,String>> list = Arrays.asList(
+        List<BiConsumer<PlatUserVO, String>> list = Arrays.asList(
                 PlatUserVO::setCityOrgId,
                 PlatUserVO::setDistrictOrgId,
                 PlatUserVO::setStreetOrgId
         );
         String[] split = orgPath.split(",");
         for (int i = 1; i < split.length; i++) {
-            BiConsumer<PlatUserVO, String> e = list.get(i-1);
-            e.accept(this,split[i]);
+            BiConsumer<PlatUserVO, String> e = list.get(i - 1);
+            e.accept(this, split[i]);
         }
         this.initFlag = true;
     }

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

+package com.makeit.dto.platform.space;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PlatSpaceSplitDTO {
+
+    @ApiModelProperty(value = "空间id")
+    private String spaceId;
+
+
+    @ApiModelProperty(value = "小区/社区/街道空间id")
+    private String streetSpaceId;
+
+
+    @ApiModelProperty(value = "楼栋空间id")
+    private String buildingSpaceId;
+
+
+    @ApiModelProperty(value = "单元空间id")
+    private String unitSpaceId;
+
+
+    @ApiModelProperty(value = "楼层id")
+    private String floorSpaceId;
+
+
+    @ApiModelProperty(value = "房间id")
+    private String roomId;
+
+
+    @ApiModelProperty(value = "床位id")
+    private String bedId;
+
+    @ApiModelProperty(value = "空间-房间-床位路径")
+    private String spacePath;
+
+}

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

@@ -14,6 +14,7 @@ import com.makeit.dto.platform.elder.PlatElderCheckOutDTO;
 import com.makeit.dto.platform.elder.PlatElderImportDTO;
 import com.makeit.dto.platform.elder.PlatElderQueryDTO;
 import com.makeit.dto.platform.elder.add.*;
+import com.makeit.dto.platform.space.PlatSpaceSplitDTO;
 import com.makeit.dto.platform.space.TreeDTOVO;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.device.PlatDevice;
@@ -29,7 +30,6 @@ import com.makeit.enums.CommonEnum;
 import com.makeit.enums.FileSuffixEnum;
 import com.makeit.enums.id.TreeConst;
 import com.makeit.exception.BusinessException;
-import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.mapper.platform.elder.PlatElderMapper;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.*;
@@ -457,6 +457,20 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             if (errorVoList.isEmpty()) {
                 List<PlatElder> platElderList = BeanDtoVoUtils.listVo(list, PlatElder.class);
 
+                platElderList.forEach(e -> {
+                    List<String> spaceIdList = new ArrayList<>(Arrays.asList(e.getStreetSpaceId(), e.getBuildingSpaceId(), e.getUnitSpaceId(), e.getFloorSpaceId()));
+
+                    List<String> newSpaceIdList = new ArrayList<>(spaceIdList);
+                    Collections.reverse(newSpaceIdList);
+
+                    e.setSpaceId(newSpaceIdList.stream().filter(StringUtils::isNotBlank).findFirst().orElse(null));
+
+                    spaceIdList.add(e.getRoomId());
+                    spaceIdList.add(e.getBedId());
+
+                    e.setSpacePath(spaceIdList.stream().filter(StringUtils::isNotBlank).collect(Collectors.joining(",")));
+                });
+
                 PlatUserVO platUserVO = PlatUserUtil.getUserVO();
 
                 platElderList.forEach(e -> {
@@ -492,6 +506,25 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
     }
 
+    private void fillSpace(PlatElder platElder) {
+
+        if (StringUtils.isBlank(platElder.getBedId())) {
+            return;
+        }
+
+        PlatSpaceSplitDTO platSpaceSplitDTO = platSpaceService.getSpaceSplitVO(platElder.getBedId());
+
+        platElder.setSpaceId(platSpaceSplitDTO.getSpaceId());
+        platElder.setStreetSpaceId(platSpaceSplitDTO.getStreetSpaceId());
+        platElder.setBuildingSpaceId(platSpaceSplitDTO.getBuildingSpaceId());
+        platElder.setUnitSpaceId(platSpaceSplitDTO.getUnitSpaceId());
+        platElder.setFloorSpaceId(platSpaceSplitDTO.getFloorSpaceId());
+        platElder.setRoomId(platSpaceSplitDTO.getRoomId());
+        //platElder.setBedId();
+        platElder.setSpacePath(platSpaceSplitDTO.getSpacePath());
+
+    }
+
     @Override
     @Transactional
     public void add(PlatElderAddDTO dto) {
@@ -500,6 +533,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
 
+        fillSpace(platElder);
+
         PlatUserVO userVO = PlatUserUtil.getUserVO();
 
         platElder.setOrgId(userVO.getOrgId());
@@ -523,6 +558,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
 
+        fillSpace(platElder);
+
         PlatUserVO userVO = PlatUserUtil.getUserVO();
 
         platElder.setOrgId(userVO.getOrgId());
@@ -602,6 +639,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
 
+        fillSpace(platElder);
+
         updateById(platElder);
 
         addOrEditExt(dto);

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

@@ -5,6 +5,7 @@ import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.vo.ExcelImportVo;
 import com.makeit.dto.platform.space.PlatSpaceAddDTO;
 import com.makeit.dto.platform.space.PlatSpaceQueryDTO;
+import com.makeit.dto.platform.space.PlatSpaceSplitDTO;
 import com.makeit.dto.platform.space.PlatSpaceVO;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
@@ -61,6 +62,8 @@ public interface PlatSpaceService extends IService<PlatSpace> {
      */
     List<PlatSpaceVO> treeByBed(PlatSpaceQueryDTO dto);
 
+    PlatSpaceSplitDTO getSpaceSplitVO(String bedId);
+
     List<PlatSpace> listChild(List<String> spaceIds);
 
     List<PlatSpaceAddDTO> oneLevelList(BaseIdDTO dto);

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

 package com.makeit.service.wechat.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
+import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
 import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
@@ -24,6 +26,9 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
     @Autowired
     private PlatElderChildrenInfoService platElderChildrenInfoService;
 
+    @Autowired
+    private PlatOrgService platOrgService;
+
     @Override
     @Transactional
     public WechatUserInfo login(WechatLoginPhoneDTO dto) {
@@ -34,8 +39,19 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
                 .eq(PlatElderChildrenInfo::getOpenid, userInfo.getOpenId()));
         if (childrenInfo == null) {
             childrenInfo = new PlatElderChildrenInfo();
+
             childrenInfo.setOpenid(userInfo.getOpenId());
             childrenInfo.setName(userInfo.getNickName());
+
+            PlatOrgSplitDTO vo = platOrgService.getOrgSplitVO(dto.getOrgId());
+
+            childrenInfo = new PlatElderChildrenInfo();
+
+            childrenInfo.setCityOrgId(vo.getCityOrgId());
+            childrenInfo.setDistrictOrgId(vo.getDistrictOrgId());
+            childrenInfo.setStreetOrgId(vo.getStreetOrgId());
+            childrenInfo.setOrgPath(vo.getOrgPath());
+
         }
 
         childrenInfo.setPhone(userInfo.getPhoneNumber());