修改医疗保障分类
This commit is contained in:
parent
c99f2d6155
commit
0c226aa93e
|
@ -57,7 +57,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
private IBattleConsumeService battleConsumeService;
|
||||
|
||||
private ScenarioInfo scenarioInfo;
|
||||
private ScenarioInfo scenarioInfoTmp;
|
||||
|
||||
private static final Double FOOD_SPREED = 0.3D;
|
||||
private static final Double WATER_SPREED = 0.1D;
|
||||
|
@ -92,7 +92,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(initDuringTime));
|
||||
String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo");
|
||||
ScenarioInfo scenarioInfo =JSONObject.parseObject(jsonStr,ScenarioInfo.class);
|
||||
this.scenarioInfo = scenarioInfo;
|
||||
this.scenarioInfoTmp = scenarioInfo;
|
||||
log.info("===============================初始化本次战斗任务各种资源数====================================");
|
||||
double suppleAmount =scenarioInfo.getAmmunition().getTotal();
|
||||
int suppleDeath =scenarioInfo.getPerson().getDeath();
|
||||
|
@ -433,25 +433,25 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId());
|
||||
|
||||
if ("HOSPITAL".equals(teaminfo.getRoleCode())) {
|
||||
if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) {
|
||||
supplierResource = resource;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (supplierResource == null) {
|
||||
log.error("找不到对应的医院分队");
|
||||
log.error("找不到对应的医疗保障分队");
|
||||
return;
|
||||
}
|
||||
//找出医院
|
||||
List<ScenarioResource> resources = SpringUtil.getBean(ScenarioResourceServiceImpl.class)
|
||||
.selectResourceByRoleCode(scenarioTask.getScenarioId(), "HOSPITAL");
|
||||
if (resources.isEmpty()) {
|
||||
log.error("找不到医院仓库");
|
||||
log.error("找不到医院");
|
||||
return;
|
||||
}
|
||||
|
||||
produceMoveTask(supplierResource, resources.get(0), this.coordinateReference.get(), injured);
|
||||
produceMoveTask(supplierResource, resources.get(0), injured);
|
||||
|
||||
|
||||
} else {
|
||||
|
@ -464,7 +464,7 @@ public class BattleRootTask extends AbtParentTask {
|
|||
}
|
||||
|
||||
private void produceMoveTask(ScenarioResource supplierResource, ScenarioResource fuelResource,
|
||||
Coordinate coordinate, Integer injured) {
|
||||
Integer injured) {
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
|
@ -473,8 +473,8 @@ public class BattleRootTask extends AbtParentTask {
|
|||
|
||||
task.setFromLat(supplierResource.getLat());
|
||||
task.setFromLng(supplierResource.getLng());
|
||||
task.setToLat(fuelResource.getLat());
|
||||
task.setToLng(fuelResource.getLng());
|
||||
task.setToLat(this.scenarioInfoTmp.getSdzy().getLat());
|
||||
task.setToLng(this.scenarioInfoTmp.getSdzy().getLng());
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromSource("general");
|
||||
log.info("承担保障任务的resourceId::{}", supplierResource.getId());
|
||||
|
@ -483,7 +483,6 @@ public class BattleRootTask extends AbtParentTask {
|
|||
@Override
|
||||
public void doSomeThing() {
|
||||
//创建一个保障任务
|
||||
|
||||
ScenarioTask task = new ScenarioTask();
|
||||
task.setId(IdUtils.simpleUUID());
|
||||
task.setScenarioId(scenarioTask.getScenarioId());
|
||||
|
@ -491,11 +490,11 @@ public class BattleRootTask extends AbtParentTask {
|
|||
task.setTaskType("3");
|
||||
task.setInsureResourceId(scenarioTask.getResourceId());
|
||||
task.setSupplierNum(injured);
|
||||
task.setToLat(coordinate.getLat() + "");
|
||||
task.setToLng(coordinate.getLng() + "");
|
||||
task.setToLat(fuelResource.getLat());
|
||||
task.setToLng(fuelResource.getLng() + "");
|
||||
task.setStartTime(LocalDateTime.now());
|
||||
task.setFromLat(fuelResource.getLat());
|
||||
task.setFromLng(fuelResource.getLng());
|
||||
task.setFromLat(scenarioInfoTmp.getSdzy().getLat());
|
||||
task.setFromLng(scenarioInfoTmp.getSdzy().getLng());
|
||||
task.setFromSource("general");
|
||||
SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task);
|
||||
SupplierTask supplierTask = new SupplierTask(task, roomId);
|
||||
|
|
Loading…
Reference in New Issue
Block a user