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

Compare commits

base: liyudong:d1d2d52d19f638465ebe3eeeea72046fdd756694
Branches Tags
liyudong:main
...
compare: liyudong:18392d6961f2e3db1dd5f4945466b4fb63423f36
Branches Tags
liyudong:main

2 Commits
d1d2d52d19 ... 18392d6961

Author SHA1 Message Date
wangwenhua
18392d6961 Merge remote-tracking branch 'origin/main' 2025-09-22 18:24:01 +08:00
wangwenhua
4499b58606 修改bug 2025-09-22 18:23:37 +08:00
1 changed files with 65 additions and 76 deletions
Show Stats Expand all files Collapse all files

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

@ -105,7 +105,7 @@ public class BattleRootTask extends AbtParentTask {
this.createBattleTaskOnTimingHandle(new BizTaskOnTiming() { this.createBattleTaskOnTimingHandle(new BizTaskOnTiming() {
@Override @Override
public void execTask() { public void execTask() {
log.info("===============================定时检查统计各种资源消耗量 begin===================================="); log.info("===============================战斗检查统计各种资源消耗量 begin====================================");
Long deathConsume = null; Long deathConsume = null;
Long injuredConsume = null; Long injuredConsume = null;
Double ammunitionConsume = null; Double ammunitionConsume = null;
@ -118,7 +118,8 @@ public class BattleRootTask extends AbtParentTask {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
ScenarioInfo scenarioInfoOnTime =JSONObject.parseObject(jsonStr,ScenarioInfo.class); ScenarioInfo scenarioInfoOnTime =JSONObject.parseObject(jsonStr,ScenarioInfo.class);
String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
try { try {
long duringTime = getDuringTime(); long duringTime = getDuringTime();
@ -134,77 +135,86 @@ public class BattleRootTask extends AbtParentTask {
teamLng = scenarioInfoOnTime.getTeam().getLng().toString(); teamLng = scenarioInfoOnTime.getTeam().getLng().toString();
if(scenarioInfoOnTime.getPerson().getCurrent() >0) { if(scenarioInfoOnTime.getPerson().getCurrent() >0) {
// //
int deathParam = RandomUtil.getSecureRandom().nextInt(6); do {
int baseParam = deathParam/2; int deathParam = RandomUtil.getSecureRandom().nextInt(6);
if(deathParam !=0 ) { int baseParam = deathParam / 2;
deathConsume = Long.valueOf(deathParam % baseParam); if (deathParam != 0 && baseParam != 0) {
}else{ deathConsume = Long.valueOf(deathParam % baseParam);
deathConsume =0L; } else {
deathConsume = 0L;
}
injuredConsume = Long.valueOf(RandomUtil.getSecureRandom().nextInt(3));
} }
injuredConsume = Long.valueOf(RandomUtil.getSecureRandom().nextInt(3)); while(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() < 0);
ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble()); ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble());
foodConsume = FOOD_SPREED; foodConsume = FOOD_SPREED;
waterConsume = WATER_SPREED; waterConsume = WATER_SPREED;
medicalConsume = MEDICAL_SPREED; medicalConsume = MEDICAL_SPREED;
if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunition - ammunitionConsume)>0) {
scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume));
}else{
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(food - foodConsume)> 0) {
scenarioInfoOnTime.getFood().setCurrent(Double.valueOf(food - foodConsume));
}else{
scenarioInfoOnTime.getFood().setCurrent(0D);
}
if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medical - medicalConsume)> 0) {
scenarioInfoOnTime.getMedical().setCurrent(Double.valueOf(medical - medicalConsume));
}else{
scenarioInfoOnTime.getMedical().setCurrent(0D);
}
if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(water - waterConsume)> 0) {
scenarioInfoOnTime.getWater().setCurrent(Double.valueOf(water - waterConsume));
}else{
scenarioInfoOnTime.getWater().setCurrent(0D);
}
scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(death + deathConsume).intValue()); scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(death + deathConsume).intValue());
scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue()); scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue());
if(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <0){ if(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <=0){
scenarioInfoOnTime.getPerson().setCurrent(0); scenarioInfoOnTime.getPerson().setCurrent(0);
}else { }else {
scenarioInfoOnTime.getPerson().setCurrent(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue() - Long.valueOf(injuredConsume).intValue()); scenarioInfoOnTime.getPerson().setCurrent(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue() - Long.valueOf(injuredConsume).intValue());
} }
String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(death + deathConsume).intValue());
EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue());
if(updScenarioInfo.getJbxx().getAmmunition().getCurrent() - Double.valueOf(ammunition - ammunitionConsume)>0) { if(updScenarioInfo.getJbxx().getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <=0){
updScenarioInfo.getJbxx().getPerson().setCurrent(0);
}else {
updScenarioInfo.getJbxx().getPerson().setCurrent(updScenarioInfo.getJbxx().getPerson().getCurrent() - Long.valueOf(deathConsume).intValue() - Long.valueOf(injuredConsume).intValue());
}
}else {
if(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath() > 0){
scenarioInfoOnTime.getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath());
updScenarioInfo.getJbxx().getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath());
}
}
if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) {
scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume));
}else{
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(foodConsume)> 0) {
scenarioInfoOnTime.getFood().setCurrent(Double.valueOf(food - foodConsume));
}else{
scenarioInfoOnTime.getFood().setCurrent(0D);
}
if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medicalConsume)> 0) {
scenarioInfoOnTime.getMedical().setCurrent(Double.valueOf(medical - medicalConsume));
}else{
scenarioInfoOnTime.getMedical().setCurrent(0D);
}
if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(waterConsume)> 0) {
scenarioInfoOnTime.getWater().setCurrent(Double.valueOf(water - waterConsume));
}else{
scenarioInfoOnTime.getWater().setCurrent(0D);
}
if(updScenarioInfo.getJbxx().getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) {
updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume)); updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume));
}else{ }else{
updScenarioInfo.getJbxx().getAmmunition().setCurrent(0D); updScenarioInfo.getJbxx().getAmmunition().setCurrent(0D);
} }
if(updScenarioInfo.getJbxx().getFood().getCurrent() - Double.valueOf(food - foodConsume) > 0) { if(updScenarioInfo.getJbxx().getFood().getCurrent() - Double.valueOf(foodConsume) > 0) {
updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(food - foodConsume)); updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(food - foodConsume));
}else{ }else{
updScenarioInfo.getJbxx().getFood().setCurrent(0D); updScenarioInfo.getJbxx().getFood().setCurrent(0D);
} }
// updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume)); // updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume));
if(updScenarioInfo.getJbxx().getMedical().getCurrent() - Double.valueOf(medical - medicalConsume)> 0) { if(updScenarioInfo.getJbxx().getMedical().getCurrent() - Double.valueOf(medicalConsume)> 0) {
updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(medical - medicalConsume));
}else{ }else{
updScenarioInfo.getJbxx().getMedical().setCurrent(0D); updScenarioInfo.getJbxx().getMedical().setCurrent(0D);
} }
if(updScenarioInfo.getJbxx().getWater().getCurrent() -Double.valueOf(water - waterConsume)> 0) { if(updScenarioInfo.getJbxx().getWater().getCurrent() -Double.valueOf(waterConsume)> 0) {
updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume)); updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume));
}else{ }else{
updScenarioInfo.getJbxx().getWater().setCurrent(0D); updScenarioInfo.getJbxx().getWater().setCurrent(0D);
} }
updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(death + deathConsume).intValue());
updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue());
if(updScenarioInfo.getJbxx().getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <0){
updScenarioInfo.getJbxx().getPerson().setCurrent(0);
}else {
updScenarioInfo.getJbxx().getPerson().setCurrent(updScenarioInfo.getJbxx().getPerson().getCurrent() - Long.valueOf(deathConsume).intValue() - Long.valueOf(injuredConsume).intValue());
}
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
"updScenarioInfo", JSON.toJSONString(updScenarioInfo)); "updScenarioInfo", JSON.toJSONString(updScenarioInfo));
ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>(); ResponseCmdInfo<String> respObj = new ResponseCmdInfo<>();
@ -215,37 +225,17 @@ public class BattleRootTask extends AbtParentTask {
Global.sendCmdInfoQueue.add(respObj); 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(scenarioInfoOnTime)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
}else{
log.info("=========================scenarioInfoOnTime.getPerson().getCurrent()==========={}========================================================",scenarioInfoOnTime.getPerson().getCurrent()); if(scenarioInfoOnTime.getAmmunition().getCurrent() <0) {
String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
if(updScenarioInfo.getJbxx().getAmmunition().getCurrent() <0) {
updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(0));
}
if(updScenarioInfo.getJbxx().getFood().getCurrent() < 0) {
updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(0));
}
// updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume));
if(updScenarioInfo.getJbxx().getMedical().getCurrent() < 0) {
updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(0));
}
if(updScenarioInfo.getJbxx().getWater().getCurrent() < 0) {
updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(0));
}
updScenarioInfo.getJbxx().getPerson().setCurrent(0);
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
}
if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunition - ammunitionConsume)<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D); scenarioInfoOnTime.getAmmunition().setCurrent(0D);
} }
if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(food - foodConsume)<0) { if(scenarioInfoOnTime.getFood().getCurrent()<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D); scenarioInfoOnTime.getAmmunition().setCurrent(0D);
} }
if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medical - medicalConsume)<0) { if(scenarioInfoOnTime.getMedical().getCurrent()<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D); scenarioInfoOnTime.getAmmunition().setCurrent(0D);
} }
if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(water - waterConsume)<0) { if(scenarioInfoOnTime.getWater().getCurrent()<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D); scenarioInfoOnTime.getAmmunition().setCurrent(0D);
} }
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
@ -362,8 +352,8 @@ public class BattleRootTask extends AbtParentTask {
ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
scenarioInfoInjured.getPerson().setDeath(Long.valueOf(0).intValue()); scenarioInfoInjured.getPerson().setDeath(Long.valueOf(0).intValue());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured));
String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue()); updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
"updScenarioInfo", JSON.toJSONString(updScenarioInfo)); "updScenarioInfo", JSON.toJSONString(updScenarioInfo));
@ -394,8 +384,8 @@ public class BattleRootTask extends AbtParentTask {
ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class);
scenarioInfoInjured.getPerson().setInjured(Long.valueOf(0).intValue()); scenarioInfoInjured.getPerson().setInjured(Long.valueOf(0).intValue());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured));
String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo");
EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class);
updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(0).intValue()); updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(0).intValue());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
"updScenarioInfo", JSON.toJSONString(updScenarioInfo)); "updScenarioInfo", JSON.toJSONString(updScenarioInfo));
@ -407,7 +397,7 @@ public class BattleRootTask extends AbtParentTask {
ex.printStackTrace(); ex.printStackTrace();
log.error("===========BattleRootTask supplierRequestService.saveBatch error====================",ex.getMessage()); log.error("===========BattleRootTask supplierRequestService.saveBatch error====================",ex.getMessage());
} }
log.info("===============================定时检查统计各种资源消耗量 end===================================="); log.info("===============================战斗检查统计各种资源消耗量 end====================================");
} }
}); });
@ -435,7 +425,6 @@ public class BattleRootTask extends AbtParentTask {
if ("HOSPITAL".equals(teaminfo.getRoleCode())) { if ("HOSPITAL".equals(teaminfo.getRoleCode())) {
supplierResource = resource; supplierResource = resource;
break; break;
} }
} }