Merge branch 'package' of GameCenter/game-center into dev

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <区服导量调试修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <新增获取全量区服接口> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -84,6 +84,14 @@ public class GameServerController {
     @PreAuthorize(permissionKey = "manage:gameServer:unMergeServer")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameServerVO.class)})
     public ResultVO<List<GameServerVO>> unMergeServerList(@RequestParam Long gameId) {
-        return ResultVO.ok(gameServerService.unMergeServerList(gameId));
+        return ResultVO.ok(gameServerService.getServerList(gameId, Boolean.FALSE));
+    }
+
+    @ApiOperation(value = "获取所有区服列表(无分页)")
+    @GetMapping(value = "/all/server/list")
+    @PreAuthorize(permissionKey = "manage:gameServer:allServer")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = GameServerVO.class)})
+    public ResultVO<List<GameServerVO>> allServerList(@RequestParam Long gameId) {
+        return ResultVO.ok(gameServerService.getServerList(gameId, null));
     }
 }

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

@@ -10,7 +10,6 @@ import com.zanxiang.game.module.manage.pojo.vo.GameServerVO;
 import com.zanxiang.game.module.mybatis.entity.GameServer;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author : lingfeng
@@ -61,10 +60,11 @@ public interface IGameServerService extends IService<GameServer> {
     Boolean mergeServerAddUpdate(GameMergeServerParam param);
 
     /**
-     * 未参与合服的区服列表
+     * 获取区服列表
      *
-     * @param gameId 游戏id
+     * @param gameId  游戏id
+     * @param isMerge
      * @return {@link List}<{@link GameServerVO}>
      */
-    List<GameServerVO> unMergeServerList(Long gameId);
+    List<GameServerVO> getServerList(Long gameId, Boolean isMerge);
 }

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

@@ -261,11 +261,11 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     }
 
     @Override
-    public List<GameServerVO> unMergeServerList(Long gameId) {
+    public List<GameServerVO> getServerList(Long gameId, Boolean isMerge) {
         return super.list(new LambdaQueryWrapper<GameServer>()
                 .select(GameServer::getServerId, GameServer::getServerName)
                 .eq(GameServer::getGameId, gameId)
-                .eq(GameServer::getIsMerge, Boolean.FALSE)
+                .eq(GameServer::getIsMerge, isMerge)
                 .orderByAsc(GameServer::getStartTime)
         ).stream().map(gameServer -> BeanUtil.copy(gameServer, GameServerVO.class))
                 .collect(Collectors.toList());