From d0789c5a7cc3db3bdcd607ae0fb185dc7a1402e6 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Sun, 21 Sep 2025 02:24:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80scenari?= =?UTF-8?q?o=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hivekion/room/bean/BattleRootTask.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index fee7aa9..fd937e1 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -157,6 +157,24 @@ public class BattleRootTask extends AbtParentTask { scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume)); scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue()); scenarioInfo.getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue()); + + String updJsonStr= (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"updScenarioInfo"); + EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); + updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume)); + updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(food - foodConsume)); + updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume)); + updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); + updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume)); + updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(death+deathConsume).intValue()); + updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), + "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); + ResponseCmdInfo respObj = new ResponseCmdInfo<>(); + respObj.setData(JSON.toJSONString(updScenarioInfo)); + respObj.setRoom(roomId); + respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("updScenarioInfo"); + Global.sendCmdInfoQueue.add(respObj); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(duringTime)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo",JSONObject.toJSONString(scenarioInfo)); }catch (Exception ex){ @@ -226,7 +244,7 @@ public class BattleRootTask extends AbtParentTask { respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setRoom(roomId); respObj.setScenarioId(scenarioTask.getScenarioId()); - respObj.setCmdType(""); + respObj.setCmdType("ammunitionRequest"); Global.sendCmdInfoQueue.add(respObj); suppleFlagMap.put("ammunition",true) ; } @@ -249,6 +267,7 @@ public class BattleRootTask extends AbtParentTask { respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setRoom(roomId); respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("deathRequest"); Global.sendCmdInfoQueue.add(respObj); suppleFlagMap.put("death",true) ; } @@ -268,6 +287,7 @@ public class BattleRootTask extends AbtParentTask { respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setRoom(roomId); respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("injuredRequest"); Global.sendCmdInfoQueue.add(respObj); suppleFlagMap.put("injured",true) ; } From 357bb500f2ba3d2e28c1e558a88a504384496458 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Sun, 21 Sep 2025 02:42:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80scenari?= =?UTF-8?q?o=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/service/impl/ScenarioServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java index 5afacdc..ac39ceb 100644 --- a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java +++ b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java @@ -102,6 +102,12 @@ public class ScenarioServiceImpl implements ScenarioService { staffList = fightpowerstaffService.queryByOrgIds(orgList); if(CollectionUtil.isEmpty(staffList)){ staffList = new ArrayList<>(); + }else{ + int sum = staffList.stream() + .mapToInt(Fightpowerstaff::getNumber) + .sum(); + scenarioInfo.getPerson().setCurrent(sum); + scenarioInfo.getPerson().setTotal(sum); } //获取物资信息 suppliers = orgSupplierService.selectByOrgIds(orgList); @@ -248,6 +254,12 @@ public class ScenarioServiceImpl implements ScenarioService { staffList = fightpowerstaffService.queryByOrgIds(orgList); if(CollectionUtil.isEmpty(staffList)){ staffList = new ArrayList<>(); + }else{ + int sum = staffList.stream() + .mapToInt(Fightpowerstaff::getNumber) + .sum(); + scenarioInfo.getJbxx().getPerson().setCurrent(sum); + scenarioInfo.getJbxx().getPerson().setTotal(sum); } //获取物资信息 suppliers = orgSupplierService.selectByOrgIds(orgList); From c5e33a4d421ffb7474fee4c62e20dac2943a0530 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Sun, 21 Sep 2025 02:45:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80scenari?= =?UTF-8?q?o=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/hivekion/room/bean/BattleRootTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index fd937e1..ba8bdd8 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -157,6 +157,7 @@ public class BattleRootTask extends AbtParentTask { scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume)); scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue()); scenarioInfo.getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue()); + scenarioInfo.getPerson().setCurrent(scenarioInfo.getPerson().getCurrent()-Long.valueOf(death+deathConsume).intValue()); String updJsonStr= (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"updScenarioInfo"); EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); @@ -167,6 +168,7 @@ public class BattleRootTask extends AbtParentTask { updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume)); updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(death+deathConsume).intValue()); updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(injured +injuredConsume).intValue()); + updScenarioInfo.getJbxx().getPerson().setCurrent(updScenarioInfo.getJbxx().getPerson().getCurrent()-Long.valueOf(death+deathConsume).intValue()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); ResponseCmdInfo respObj = new ResponseCmdInfo<>();