From 2682d7fa7d35ce634bbd30670f0a38cd6f96c226 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 30 Jun 2021 17:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossService/CrossServiceLogic.java | 3 ++- .../ljsd/jieling/logic/arena/ArenaLogic.java | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 5f2028bf7..fe28d4a56 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -42,7 +42,8 @@ public class CrossServiceLogic { MongoTemplate core = MongoUtil.getCoreMongoTemplate(); Query query = new Query(); query.addCriteria(Criteria.where("server_id").is(String.valueOf(serverId))); - return core.findOne(query, CoreOfServerInfo.class).getName(); + CoreOfServerInfo one = core.findOne(query, CoreOfServerInfo.class); + return one==null?String.valueOf(serverId):one.getName(); } public void insert(ArenaOfUser arenaOfUser) throws UnknownHostException { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 5a58fc3e7..edd1fe42d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -954,15 +954,20 @@ public class ArenaLogic { int enemyId = enemy.getEnemyId(); SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(enemyId); CommonProto.Team teamBuild = CommonProto.Team.newBuilder().addAllHeroTid(sArenaRobotConfig.getHeroList()).build(); - CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder() - .setUid(enemy.getEnemyId_UUid()) - .setLevel(sArenaRobotConfig.getRobotLevel()) - .setName(enemy.getRandomName()==null?"":enemy.getRandomName()) - .setScore(sArenaRobotConfig.getRobotScore()) - .setTotalForce(sArenaRobotConfig.getTotalForce()) - .setServername(String.valueOf(enemy.getServerID())) - .setRank(rank) - .build(); + CommonProto.ArenaPersonInfo personInfoBuild = null; + try { + personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder() + .setUid(enemy.getEnemyId_UUid()) + .setLevel(sArenaRobotConfig.getRobotLevel()) + .setName(enemy.getRandomName()==null?"":enemy.getRandomName()) + .setScore(sArenaRobotConfig.getRobotScore()) + .setTotalForce(sArenaRobotConfig.getTotalForce()) + .setServername(CrossServiceLogic.getInstance().findServerName(enemy.getServerID())) + .setRank(rank) + .build(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } return CommonProto.ArenaEnemy.newBuilder() .setPersonInfo(personInfoBuild) .setWorshipTime(proudTime)