Merge branch 'dev_-0901' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/service/MetaPlayerInfoService.java

@@ -46,12 +46,23 @@ public class MetaPlayerInfoService {
         return MetaRestResult.returnSuccess(spaceObjectsInfo);
     }
 
+    public MetaRestResult<SpaceObjectsInfo> personalMetaSpaceInfo(Long userId) {
+        SpaceObjectsInfo spaceObjectsInfo = new SpaceObjectsInfo();
+        try {
+            List<SpaceObjectsInfo> spaceObjectsInfos = spaceObjectsInfoRepo.findAllByUserId(userId);
+            spaceObjectsInfo.setBuildingList(buildingList(userId, spaceObjectsInfos));
+        } catch (Exception e) {
+            return MetaRestResult.returnError(e.getMessage());
+        }
+        return MetaRestResult.returnSuccess(spaceObjectsInfo);
+    }
+
     public MetaRestResult<SpaceObjectsInfo> updateMetaPersonalSpace(SpaceObjectsInfo spaceObjectsInfo) {
-        if(Objects.isNull(spaceObjectsInfo.getId())) {
+        if (Objects.isNull(spaceObjectsInfo.getId())) {
             return MetaRestResult.returnError("参数不合法，缺少空间物品信息记录id");
         }
         SpaceObjectsInfo dbSpaceObjectsInfo = spaceObjectsInfoRepo.findById(spaceObjectsInfo.getId()).orElse(null);
-        if(Objects.isNull(dbSpaceObjectsInfo)) {
+        if (Objects.isNull(dbSpaceObjectsInfo)) {
             return MetaRestResult.returnError(String.format("操作失败：不存在id[%S]的空间物品数据", spaceObjectsInfo.getSpaceId()));
         }
         List<BuildingPosDTO> buildingPosList = spaceObjectsInfo.getBuildingPosList();
@@ -122,7 +133,7 @@ public class MetaPlayerInfoService {
                 });
             }
         });
-        if(CollectionUtil.isEmpty(buildingList)) {
+        if (CollectionUtil.isEmpty(buildingList)) {
             // 如过buildingList为空，且用户有编辑过的物品返回错误
             if (CollectionUtil.isNotEmpty(map)) {
                 throw new BusinessException("当前用户物品数据异常：用户未持有相关藏品，个人空间中有已编辑藏品信息");

src/main/java/com/izouma/nineth/web/MetaPlayerInfoController.java

@@ -68,6 +68,11 @@ public class MetaPlayerInfoController {
         return metaPlayerInfoService.metaSpaceInfo(userId, spaceId);
     }
 
+    @GetMapping("/{userId}/personalMetaSpaceInfo")
+    public MetaRestResult<SpaceObjectsInfo> personalMetaSpaceInfo(@PathVariable Long userId) {
+        return metaPlayerInfoService.personalMetaSpaceInfo(userId);
+    }
+
     @PostMapping("/updateMetaPersonalSpace")
     public MetaRestResult<SpaceObjectsInfo> updateMetaPersonalSpace(@RequestBody SpaceObjectsInfo spaceObjectsInfo) {
         return metaPlayerInfoService.updateMetaPersonalSpace(spaceObjectsInfo);