元宇宙接口调整

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

@@ -24,7 +24,16 @@ public class MetaPlayerInfo {
     @ApiModelProperty("勋章等级")
     private int level;
 
+    @ApiModelProperty("境界")
+    private String realm;
+
+    @ApiModelProperty("头衔")
+    private String title;
+
     @ApiModelProperty("玩家上次离线的服饰信息")
     private List<MetaPlayerWear> metaPlayerWearList;
 
+    @ApiModelProperty("玩家上次离线的皮肤编号，默认为0")
+    private int skinId = 0;
+
 }

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

@@ -26,4 +26,7 @@ public class MetaPlayerOfflineInfo extends BaseEntity {
     @ApiModelProperty("离线时服饰id集合")
     private List<Long> clothesId;
 
+    @ApiModelProperty("离线时皮肤编号")
+    private int skinId;
+
 }

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

@@ -31,7 +31,4 @@ public class MetaPlayerWearCount {
 
     @ApiModelProperty("动作")
     private List<MetaPlayerWear> actionList;
-
-    @ApiModelProperty("皮肤")
-    private List<MetaPlayerWear> skinList;
 }

src/main/java/com/izouma/nineth/enums/MetaPlayerWearEnum.java

@@ -7,8 +7,7 @@ public enum MetaPlayerWearEnum {
     CLOTHES("衣服"),
     TROUSERS("裤子"),
     SHOES("鞋子"),
-    ACTION("动作"),
-    SKIN("皮肤");
+    ACTION("动作");
 
     private final String description;
 

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

@@ -3,8 +3,10 @@ package com.izouma.nineth.repo;
 import com.izouma.nineth.domain.MetaPlayerOfflineInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 public interface MetaPlayerOfflineInfoRepo extends JpaRepository<MetaPlayerOfflineInfo, Long>, JpaSpecificationExecutor<MetaPlayerOfflineInfo> {
 
+    @Query(value = "select * from meta_player_offline_info a where a.user_id = ?1 order by a.created_at desc limit 1",nativeQuery = true)
     MetaPlayerOfflineInfo findLastByUserId(Long userId);
 }

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

@@ -13,4 +13,12 @@ public interface PurchaseLevelRepo extends JpaRepository<PurchaseLevel, Long>, J
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    @Query(value = "select * from purchase_level a where a.start_level <= ?1 and a.end_level >= ?1 and a.del = 0",nativeQuery = true)
+    PurchaseLevel findByLevel(int level);
+
+    @Query(value = "select max(start_level) from purchase_level",nativeQuery = true)
+    int findMaxStartLevel();
+
+    PurchaseLevel findByStartLevel(int startLevel);
 }

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

@@ -3,10 +3,7 @@ package com.izouma.nineth.web;
 import cn.hutool.core.collection.CollectionUtil;
 import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.MetaRestResult;
-import com.izouma.nineth.repo.MetaPlayerOfflineInfoRepo;
-import com.izouma.nineth.repo.MetaPlayerWearRepo;
-import com.izouma.nineth.repo.MetaUserRepo;
-import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.repo.*;
 import com.izouma.nineth.service.MetaPlayerInfoService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -29,6 +26,8 @@ public class MetaPlayerInfoController {
 
     private MetaUserRepo metaUserRepo;
 
+    private PurchaseLevelRepo purchaseLevelRepo;
+
     @GetMapping("/{userId}/detail")
     public MetaRestResult<MetaPlayerInfo> findMetaPlayerInfo(@PathVariable Long userId) {
         User user = userRepo.findById(userId).orElse(null);
@@ -38,11 +37,21 @@ public class MetaPlayerInfoController {
         MetaPlayerInfo metaPlayerInfo = new MetaPlayerInfo();
         metaPlayerInfo.setAvatar(user.getAvatar());
         metaPlayerInfo.setLevel(user.getLevel());
+        int maxStartLevel = purchaseLevelRepo.findMaxStartLevel();
+        PurchaseLevel purchaseLevel;
+        if (user.getLevel() >= maxStartLevel) {
+            purchaseLevel = purchaseLevelRepo.findByStartLevel(maxStartLevel);
+        } else {
+            purchaseLevel = purchaseLevelRepo.findByLevel(user.getLevel());
+        }
+        metaPlayerInfo.setRealm(purchaseLevel.getRealm());
+        metaPlayerInfo.setTitle(purchaseLevel.getTitle());
         metaPlayerInfo.setNickname(user.getNickname());
         MetaPlayerOfflineInfo metaPlayerOfflineInfo = metaPlayerOfflineInfoRepo.findLastByUserId(userId);
         if (Objects.isNull(metaPlayerOfflineInfo)) {
             return MetaRestResult.returnSuccess(metaPlayerInfo);
         }
+        metaPlayerInfo.setSkinId(metaPlayerOfflineInfo.getSkinId());
         List<Long> clothesId = metaPlayerOfflineInfo.getClothesId();
         if (CollectionUtil.isEmpty(clothesId)) {
             return MetaRestResult.returnSuccess(metaPlayerInfo);

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

@@ -69,9 +69,6 @@ public class MetaPlayerWearController extends BaseController {
             Arrays.stream(MetaPlayerWearEnum.values()).forEach(metaPlayerWearEnum -> {
                 List<MetaPlayerWear> metaPlayerWears = metaPlayerWearRepo.findAllByUserIdAndType(userId, metaPlayerWearEnum);
                 switch (metaPlayerWearEnum) {
-                    case SKIN:
-                        metaPlayerWearCount.setSkinList(metaPlayerWears);
-                        break;
                     case HEADDRESS:
                         metaPlayerWearCount.setHeaddressList(metaPlayerWears);
                         break;

src/main/vue/src/views/MetaPlayerWearEdit.vue

@@ -122,8 +122,7 @@ export default {
 				{ label: '衣服', value: 'CLOTHES' },
 				{ label: '裤子', value: 'TROUSERS' },
 				{ label: '鞋子', value: 'SHOES' },
-				{ label: '动作', value: 'ACTION' },
-				{ label: '皮肤', value: 'SKIN' }
+				{ label: '动作', value: 'ACTION' }
 			]
 		};
 	},

src/main/vue/src/views/MetaPlayerWearList.vue

@@ -95,8 +95,7 @@ export default {
 				{ label: '衣服', value: 'CLOTHES' },
 				{ label: '裤子', value: 'TROUSERS' },
 				{ label: '鞋子', value: 'SHOES' },
-				{ label: '动作', value: 'ACTION' },
-				{ label: '皮肤', value: 'SKIN' }
+				{ label: '动作', value: 'ACTION' }
 			]
 		};
 	},