liyudong/simulation-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

Browse Source
This commit is contained in:
李玉东 2025-09-21 02:51:16 +08:00
commit ab69a278a4
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/hivekion/room/bean/BattleRootTask.java
View File

@ -156,6 +156,26 @@ public class BattleRootTask extends AbtParentTask {
scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume)); scenarioInfo.getWater().setCurrent(Double.valueOf(water - waterConsume));
scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue()); scenarioInfo.getPerson().setDeath(Long.valueOf(death+deathConsume).intValue());
scenarioInfo.getPerson().setInjured(Long.valueOf(injured +injuredConsume).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);
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());
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<String> 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(),"duringTime",String.valueOf(duringTime));
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo",JSONObject.toJSONString(scenarioInfo)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo",JSONObject.toJSONString(scenarioInfo));
}catch (Exception ex){ }catch (Exception ex){
@ -229,7 +249,7 @@ public class BattleRootTask extends AbtParentTask {
respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setData(JSON.toJSONString(supplierRequest));
respObj.setRoom(roomId); respObj.setRoom(roomId);
respObj.setScenarioId(scenarioTask.getScenarioId()); respObj.setScenarioId(scenarioTask.getScenarioId());
respObj.setCmdType(""); respObj.setCmdType("ammunitionRequest");
Global.sendCmdInfoQueue.add(respObj); Global.sendCmdInfoQueue.add(respObj);
suppleFlagMap.put("ammunition",true) ; suppleFlagMap.put("ammunition",true) ;
} }
@ -252,6 +272,7 @@ public class BattleRootTask extends AbtParentTask {
respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setData(JSON.toJSONString(supplierRequest));
respObj.setRoom(roomId); respObj.setRoom(roomId);
respObj.setScenarioId(scenarioTask.getScenarioId()); respObj.setScenarioId(scenarioTask.getScenarioId());
respObj.setCmdType("deathRequest");
Global.sendCmdInfoQueue.add(respObj); Global.sendCmdInfoQueue.add(respObj);
suppleFlagMap.put("death",true) ; suppleFlagMap.put("death",true) ;
} }
@ -271,6 +292,7 @@ public class BattleRootTask extends AbtParentTask {
respObj.setData(JSON.toJSONString(supplierRequest)); respObj.setData(JSON.toJSONString(supplierRequest));
respObj.setRoom(roomId); respObj.setRoom(roomId);
respObj.setScenarioId(scenarioTask.getScenarioId()); respObj.setScenarioId(scenarioTask.getScenarioId());
respObj.setCmdType("injuredRequest");
Global.sendCmdInfoQueue.add(respObj); Global.sendCmdInfoQueue.add(respObj);
suppleFlagMap.put("injured",true) ; suppleFlagMap.put("injured",true) ;
} }

12
src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
View File

@ -102,6 +102,12 @@ public class ScenarioServiceImpl implements ScenarioService {
staffList = fightpowerstaffService.queryByOrgIds(orgList); staffList = fightpowerstaffService.queryByOrgIds(orgList);
if(CollectionUtil.isEmpty(staffList)){ if(CollectionUtil.isEmpty(staffList)){
staffList = new ArrayList<>(); staffList = new ArrayList<>();
}else{
int sum = staffList.stream()
.mapToInt(Fightpowerstaff::getNumber)
.sum();
scenarioInfo.getPerson().setCurrent(sum);
scenarioInfo.getPerson().setTotal(sum);
} }
//获取物资信息 //获取物资信息
suppliers = orgSupplierService.selectByOrgIds(orgList); suppliers = orgSupplierService.selectByOrgIds(orgList);
@ -248,6 +254,12 @@ public class ScenarioServiceImpl implements ScenarioService {
staffList = fightpowerstaffService.queryByOrgIds(orgList); staffList = fightpowerstaffService.queryByOrgIds(orgList);
if(CollectionUtil.isEmpty(staffList)){ if(CollectionUtil.isEmpty(staffList)){
staffList = new ArrayList<>(); 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); suppliers = orgSupplierService.selectByOrgIds(orgList);