|
@@ -24,6 +24,7 @@ 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.JsonUtil;
|
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
|
import com.zanxiang.module.util.excel.ExcelUtil;
|
|
|
import com.zanxiang.module.util.exception.BaseException;
|
|
@@ -89,6 +90,10 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
|
|
|
List<GameServer> gameServerList = new ArrayList<>();
|
|
|
List<String> mergeSerIdList = new ArrayList<>();
|
|
|
gameServerExcelList.forEach(excelDTO -> {
|
|
|
+
|
|
|
+ log.error("excelDTO : {}", JsonUtil.toString(excelDTO));
|
|
|
+
|
|
|
+
|
|
|
Set<String> sonServerIdList = Arrays.stream(excelDTO.getServerIds().split(",")).collect(Collectors.toSet());
|
|
|
List<GameServer> sonServerList = super.list(new LambdaQueryWrapper<GameServer>()
|
|
|
.eq(GameServer::getGameId, gameId)
|
|
@@ -98,10 +103,9 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
|
|
|
log.error("sonServerIdList : {}, sonServerList : {}", sonServerIdList.toString(), sonServerList.toString());
|
|
|
|
|
|
|
|
|
-
|
|
|
List<String> collect = sonServerList.stream().map(GameServer::getServerId).collect(Collectors.toList());
|
|
|
List<String> list = sonServerIdList.stream().filter(son -> !collect.contains(son)).collect(Collectors.toList());
|
|
|
- if (!list.isEmpty()){
|
|
|
+ if (!list.isEmpty()) {
|
|
|
throw new BaseException("提交的子服中存在错误的区服id : " + list.toString());
|
|
|
}
|
|
|
}
|