接口调整

src/main/java/com/izouma/nineth/domain/SpaceObjectsInfo.java

@@ -36,4 +36,8 @@ public class SpaceObjectsInfo extends BaseEntity{
     @ApiModelProperty("空间中剩余物品信息统计")
     @Transient
     private List<BuildingDTO> buildingList;
+
+    @ApiModelProperty("是否个人空间")
+    @Transient
+    private boolean personal;
 }

src/main/java/com/izouma/nineth/repo/SpaceObjectsInfoRepo.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface SpaceObjectsInfoRepo extends JpaRepository<SpaceObjectsInfo, Long> {
 
-    SpaceObjectsInfo findByUserIdAndSpaceId(Long userId, Long spaceId);
+    SpaceObjectsInfo findBySpaceId(Long spaceId);
 
     List<SpaceObjectsInfo> findAllByUserId(Long userId);
 

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

@@ -28,14 +28,15 @@ public class MetaPlayerInfoService {
 
     private MetaItemRepo metaItemRepo;
 
-    public MetaRestResult<SpaceObjectsInfo> metaSpaceInfo(Long userId, Long spaceId, boolean personal) {
-        SpaceObjectsInfo spaceObjectsInfo = spaceObjectsInfoRepo.findByUserIdAndSpaceId(userId, spaceId);
+    public MetaRestResult<SpaceObjectsInfo> metaSpaceInfo(Long userId, Long spaceId) {
+        SpaceObjectsInfo spaceObjectsInfo = spaceObjectsInfoRepo.findBySpaceId(spaceId);
         if (Objects.isNull(spaceObjectsInfo)) {
-            return MetaRestResult.returnError(String.format("不存在用户id：%S，空间id：%S的空间信息", userId, spaceId));
+            return MetaRestResult.returnError(String.format("不存在空间id：%S的空间信息", spaceId));
         }
+        spaceObjectsInfo.setPersonal(spaceObjectsInfo.getUserId().equals(userId));
         // 如果是查询个人空间物品信息，统计用户剩余物品信息
         try {
-            if (personal) {
+            if (spaceObjectsInfo.isPersonal()) {
                 List<SpaceObjectsInfo> spaceObjectsInfos = spaceObjectsInfoRepo.findAllByUserId(userId);
                 spaceObjectsInfo.setBuildingList(buildingList(userId, spaceObjectsInfos));
             }

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

@@ -39,9 +39,9 @@ public class MetaPlayerInfoController {
         return MetaRestResult.returnSuccess(metaPlayerInfo);
     }
 
-    @GetMapping("/{userId}/{spaceId}/{personal}/metaSpaceInfo")
-    public MetaRestResult<SpaceObjectsInfo> metaSpaceInfo(@PathVariable Long userId, @PathVariable Long spaceId, @PathVariable boolean personal) {
-        return metaPlayerInfoService.metaSpaceInfo(userId, spaceId, personal);
+    @GetMapping("/{userId}/{spaceId}/metaSpaceInfo")
+    public MetaRestResult<SpaceObjectsInfo> metaSpaceInfo(@PathVariable Long userId, @PathVariable Long spaceId) {
+        return metaPlayerInfoService.metaSpaceInfo(userId, spaceId);
     }
 
     @PostMapping("/updateMetaPersonalSpace")