Merge remote-tracking branch 'origin/package' into package

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/GameAuthEnum.java

@@ -31,6 +31,16 @@ public enum GameAuthEnum {
      */
     PITCHER("PITCHER", "投手"),
 
+    /**
+     * 游戏GS
+     */
+    GS("GS", "游戏GS"),
+
+    /**
+     * 客服
+     */
+    CUSTOMER("CUSTOMER", "客服"),
+
     /**
      * 运营
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameServerController.java

@@ -6,6 +6,8 @@ import com.zanxiang.game.module.manage.pojo.params.GameMergeServerParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameServerVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameSupperVO;
 import com.zanxiang.game.module.manage.service.IGameServerService;
 import com.zanxiang.game.module.manage.service.IGameSupperService;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -18,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author : lingfeng
@@ -72,16 +74,16 @@ public class GameServerController {
     @ApiOperation(value = "获取合服超父游戏列表")
     @GetMapping(value = "/game/supper/list")
     @PreAuthorize(permissionKey = "manage:gameServer:gameSupperList")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Map<Long, String>> getGameSupperList() {
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameSupperVO.class)})
+    public ResultVO<List<GameSupperVO>> getGameSupperList() {
         return ResultVO.ok(gameSupperService.getGameSupperList());
     }
 
     @ApiOperation(value = "获取未参与合服的区服列表")
     @GetMapping(value = "/unMerge/server/list")
     @PreAuthorize(permissionKey = "manage:gameServer:unMergeServer")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Map<String, String>> unMergeServerList(@RequestParam Long gameId) {
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameServerVO.class)})
+    public ResultVO<List<GameServerVO>> unMergeServerList(@RequestParam Long gameId) {
         return ResultVO.ok(gameServerService.unMergeServerList(gameId));
     }
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameServerVO.java

@@ -0,0 +1,26 @@
+package com.zanxiang.game.module.manage.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-09-12
+ * @description : 游戏区服
+ */
+@Data
+public class GameServerVO {
+
+    /**
+     * 区服id
+     */
+    @ApiModelProperty(notes = "区服id")
+    private String serverId;
+
+    /**
+     * 区服名称
+     */
+    @ApiModelProperty(notes = "区服名称")
+    private String serverName;
+
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameSupperVO.java

@@ -0,0 +1,25 @@
+package com.zanxiang.game.module.manage.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : lingfeng
+ * @time : 2023-09-12
+ * @description : 超父游戏
+ */
+@Data
+public class GameSupperVO {
+
+    /**
+     * 游戏id
+     */
+    @ApiModelProperty(notes = "游戏id")
+    private Long id;
+
+    /**
+     * 游戏名称
+     */
+    @ApiModelProperty(notes = "游戏名称")
+    private String name;
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameServerService.java

@@ -6,6 +6,7 @@ import com.zanxiang.game.module.manage.pojo.params.GameMergeServerParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameServerVO;
 import com.zanxiang.game.module.mybatis.entity.GameServer;
 
 import java.util.List;
@@ -63,7 +64,7 @@ public interface IGameServerService extends IService<GameServer> {
      * 未参与合服的区服列表
      *
      * @param gameId 游戏id
-     * @return {@link Map}<{@link String}, {@link String}>
+     * @return {@link List}<{@link GameServerVO}>
      */
-    Map<String, String> unMergeServerList(Long gameId);
+    List<GameServerVO> unMergeServerList(Long gameId);
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameSupperService.java

@@ -1,9 +1,10 @@
 package com.zanxiang.game.module.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.game.module.manage.pojo.vo.GameSupperVO;
 import com.zanxiang.game.module.mybatis.entity.GameSupper;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author : lingfeng
@@ -16,7 +17,7 @@ public interface IGameSupperService extends IService<GameSupper> {
     /**
      * 获取超父游戏
      *
-     * @return {@link Map}<{@link Long}, {@link String}>
+     * @return {@link List}<{@link GameSupperVO}>
      */
-    Map<Long, String> getGameSupperList();
+    List<GameSupperVO> getGameSupperList();
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -14,6 +14,7 @@ import com.zanxiang.game.module.manage.pojo.params.GameMergeServerParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerAddUpdateParam;
 import com.zanxiang.game.module.manage.pojo.params.GameServerListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameServerVO;
 import com.zanxiang.game.module.manage.service.IGameAuthService;
 import com.zanxiang.game.module.manage.service.IGameServerService;
 import com.zanxiang.game.module.manage.service.IGameService;
@@ -136,6 +137,11 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         GameServerListVO gameServerListVO = BeanUtil.copy(gameServer, GameServerListVO.class);
         GameSupper gameSupper = gameSupperService.getById(gameServer.getGameId());
         gameServerListVO.setGameName(gameSupper == null ? null : gameSupper.getName());
+        //原始区服, 直接返回
+        if (Objects.equals(gameServer.getIsSourceServer(), Boolean.TRUE)) {
+            return gameServerListVO;
+        }
+        //合服
         List<String> serverIdList = new ArrayList<>();
         String[] sonServerIdArray = null;
         String[] sourceServerIdArray = null;
@@ -238,6 +244,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
                 .sonServerIds(String.join(",", param.getServerIdList()))
                 .sourceServerIds(String.join(",", sourceServerIds))
                 .mergeTime(param.getMergeTime())
+                .startTime(param.getMergeTime())
                 .isDelete(DeleteEnum.NO.getCode())
                 .createBy(SecurityUtil.getUserId())
                 .createTime(LocalDateTime.now())
@@ -247,12 +254,13 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     }
 
     @Override
-    public Map<String, String> unMergeServerList(Long gameId) {
+    public List<GameServerVO> unMergeServerList(Long gameId) {
         return super.list(new LambdaQueryWrapper<GameServer>()
                 .select(GameServer::getServerId, GameServer::getServerName)
                 .eq(GameServer::getGameId, gameId)
                 .eq(GameServer::getIsMerge, Boolean.FALSE)
-        ).stream().collect(Collectors.toMap(GameServer::getServerId, GameServer::getServerName));
+        ).stream().map(gameServer -> BeanUtil.copy(gameServer, GameServerVO.class))
+                .collect(Collectors.toList());
     }
 
     @Override

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameSupperServiceImpl.java

@@ -1,12 +1,15 @@
 package com.zanxiang.game.module.manage.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.game.module.manage.pojo.vo.GameSupperVO;
 import com.zanxiang.game.module.manage.service.IGameSupperService;
 import com.zanxiang.game.module.mybatis.entity.GameSupper;
 import com.zanxiang.game.module.mybatis.mapper.GameSupperMapper;
+import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -20,7 +23,9 @@ import java.util.stream.Collectors;
 public class GameSupperServiceImpl extends ServiceImpl<GameSupperMapper, GameSupper> implements IGameSupperService {
 
     @Override
-    public Map<Long, String> getGameSupperList() {
-        return super.list().stream().collect(Collectors.toMap(GameSupper::getId, GameSupper::getName));
+    public List<GameSupperVO> getGameSupperList() {
+        return super.list().stream()
+                .map(gameSupper -> BeanUtil.copy(gameSupper, GameSupperVO.class))
+                .collect(Collectors.toList());
     }
 }