fix : 游戏区服逻辑修改1

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameDTO.java

@@ -91,4 +91,9 @@ public class GameDTO {
      * 更新时间
      */
     private LocalDateTime updateTime;
+
+    /**
+     * 超父游戏id
+     */
+    private Long superGameId;
 }

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

@@ -17,7 +17,9 @@ import com.zanxiang.game.module.manage.pojo.vo.GameServerListVO;
 import com.zanxiang.game.module.manage.service.IGameAuthService;
 import com.zanxiang.game.module.manage.service.IGameServerService;
 import com.zanxiang.game.module.manage.service.IGameService;
+import com.zanxiang.game.module.manage.service.IGameSupperService;
 import com.zanxiang.game.module.mybatis.entity.GameServer;
+import com.zanxiang.game.module.mybatis.entity.GameSupper;
 import com.zanxiang.game.module.mybatis.mapper.GameServerMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
@@ -49,6 +51,9 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     @Autowired
     private IGameAuthService gameAuthService;
 
+    @Autowired
+    private IGameSupperService gameSupperService;
+
     @Override
     public List<String> listServerId(Long gameId, String serverName) {
         if (Strings.isBlank(serverName)) {
@@ -105,9 +110,16 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         if (param.getGameId() != null && !gameIdList.contains(param.getGameId())) {
             return new Page<>();
         }
+        Long gameId = null;
+        if (param.getGameId() != null) {
+            GameDTO gameDTO = gameService.getById(param.getGameId());
+            if (gameDTO == null || gameDTO.getSuperGameId() == null) {
+                return new Page<>();
+            }
+            gameId = gameDTO.getSuperGameId();
+        }
         return page(param.toPage(), new QueryWrapper<GameServer>().lambda()
-                .in(GameServer::getGameId, gameIdList)
-                .eq(param.getGameId() != null, GameServer::getGameId, param.getGameId())
+                .eq(gameId != null, GameServer::getGameId, param.getGameId())
                 .eq(param.getServerId() != null, GameServer::getServerId, param.getServerId())
                 .like(Strings.isNotBlank(param.getServerName()), GameServer::getServerName, param.getServerName())
                 .like(Strings.isNotBlank(param.getNickName()), GameServer::getNickName, param.getNickName())
@@ -122,8 +134,8 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
             return null;
         }
         GameServerListVO gameServerListVO = BeanUtil.copy(gameServer, GameServerListVO.class);
-        GameDTO gameDTO = gameService.getById(gameServer.getGameId());
-        gameServerListVO.setGameName(gameDTO == null ? null : gameDTO.getName());
+        GameSupper gameSupper = gameSupperService.getById(gameServer.getGameId());
+        gameServerListVO.setGameName(gameSupper == null ? null : gameSupper.getName());
         List<String> serverIdList = new ArrayList<>();
         String[] sonServerIdArray = null;
         String[] sourceServerIdArray = null;

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Game.java

@@ -106,4 +106,9 @@ public class Game implements Serializable {
      * H5游戏相关配置
      */
     private String h5GameConfig;
+
+    /**
+     * 超父游戏id
+     */
+    private Long superGameId;
 }

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameSupper.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @ToString
 @Builder
-@TableName("t_game_supper")
+@TableName("t_game_super")
 public class GameSupper implements Serializable {
 
     private static final long serialVersionUID = 1L;