Compare commits

...

2 Commits

Author SHA1 Message Date
wangwenhua
e54f7fdfde Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-21 12:51:16 +08:00
wangwenhua
982a8cd2f7 天气 2025-09-21 12:51:11 +08:00

View File

@ -299,7 +299,7 @@ public class BattleRootTask extends AbtParentTask {
SupplierRequest supplierRequest = new SupplierRequest(); SupplierRequest supplierRequest = new SupplierRequest();
supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setId(IdUtils.simpleUUID());
supplierRequest.setFromResourceId(scenarioTask.getResourceId()); supplierRequest.setFromResourceId(scenarioTask.getResourceId());
supplierRequest.setSupplierNum(String.valueOf(suppleDeath)); supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal()));
supplierRequest.setSupplierType("death"); supplierRequest.setSupplierType("death");
supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setGeneralTime(currentDateTime);
supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLat(jsonObject.get("teamLat").toString());
@ -319,7 +319,7 @@ public class BattleRootTask extends AbtParentTask {
SupplierRequest supplierRequest = new SupplierRequest(); SupplierRequest supplierRequest = new SupplierRequest();
supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setId(IdUtils.simpleUUID());
supplierRequest.setFromResourceId(scenarioTask.getResourceId()); supplierRequest.setFromResourceId(scenarioTask.getResourceId());
supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getInjured())); supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal()));
supplierRequest.setSupplierType("injured"); supplierRequest.setSupplierType("injured");
supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setGeneralTime(currentDateTime);
supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLat(jsonObject.get("teamLat").toString());