Selaa lähdekoodia

fix : excel日期格式修改

bilingfeng 1 vuosi sitten
vanhempi
commit
6f09d7c4f6

+ 1 - 1
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服务启动成功 <区服新增excel方式2> ( ´・・)ノ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <区服新增excel方式4> ( ´・・)ノ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -94,9 +94,16 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
                     .eq(GameServer::getGameId, gameId)
                     .in(GameServer::getServerId, sonServerIdList));
             if (sonServerIdList.size() != sonServerList.size()) {
+
+                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());
-                throw new BaseException("提交的子服中存在错误的区服id : " + list.toString());
+                if (!list.isEmpty()){
+                    throw new BaseException("提交的子服中存在错误的区服id : " + list.toString());
+                }
             }
             Set<String> sourceServerIds = new HashSet<>();
             sonServerList.forEach(gameServer -> {