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

Compare commits

base: liyudong:b24681426f4daf8e49f37201223c345b15d983bb
Branches Tags
liyudong:main
..
compare: liyudong:2e9a0761d316040f2f3147ce2cc580ee305a4ea6
Branches Tags
liyudong:main

No commits in common. "b24681426f4daf8e49f37201223c345b15d983bb" and "2e9a0761d316040f2f3147ce2cc580ee305a4ea6" have entirely different histories.
b24681426f ... 2e9a0761d3

5 changed files with 17 additions and 52 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/hivekion/dbData/domain/DbtoolController.java → src/main/java/com/hivekion/dbData/controller/DbtoolController.java
View File

@ -1,4 +1,4 @@
package com.hivekion.dbData.domain;
package com.hivekion.dbData.controller;
import com.hivekion.common.annotation.AutoLog;
import com.hivekion.common.enums.OperationTypeEnum;

19
src/main/java/com/hivekion/enums/DemandStatusEnum.java
View File

@ -1,19 +0,0 @@
package com.hivekion.enums;
import lombok.Getter;
public enum DemandStatusEnum {
//需求状态 //需求状态 1：未处理 2：已升级 3：等待中 4：正在处理中 5：已完成
DEMAND_NPODEAL(1),
DEMAND_LEVEL(2),
DEMAND_WATTING(3),
DEMAND_DEALING(4),
DEMAND_SUCCESSED(5);
@Getter
private int code;
DemandStatusEnum(int code) {
this.code = code;
}
}

17
src/main/java/com/hivekion/enums/TaskStatusEnum.java
View File

@ -1,17 +0,0 @@
package com.hivekion.enums;
import lombok.Getter;
public enum TaskStatusEnum {
//任务状态 1-等待中 2-运输中 3-已完成
TASK_WAITTING(1),
TASK_TRANSLATING(2),
TASK_SUCCESSED(3);
@Getter
private int code;
TaskStatusEnum(int code) {
this.code = code;
}
}

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

@ -57,7 +57,7 @@ public class BattleRootTask extends AbtParentTask {
private IBattleConsumeService battleConsumeService;
private ScenarioInfo scenarioInfoTmp;
private ScenarioInfo scenarioInfo;
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.scenarioInfoTmp = scenarioInfo;
this.scenarioInfo = scenarioInfo;
log.info("===============================初始化本次战斗任务各种资源数====================================");
double suppleAmount =scenarioInfo.getAmmunition().getTotal();
int suppleDeath =scenarioInfo.getPerson().getDeath();
@ -423,24 +423,24 @@ public class BattleRootTask extends AbtParentTask {
Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId());
if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) {
if ("HOSPITAL".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), injured);
produceMoveTask(supplierResource, resources.get(0), this.coordinateReference.get(), injured);
} else {
@ -453,7 +453,7 @@ public class BattleRootTask extends AbtParentTask {
}
private void produceMoveTask(ScenarioResource supplierResource, ScenarioResource fuelResource,
Integer injured) {
Coordinate coordinate, Integer injured) {
ScenarioTask task = new ScenarioTask();
task.setId(IdUtils.simpleUUID());
task.setScenarioId(scenarioTask.getScenarioId());
@ -462,8 +462,8 @@ public class BattleRootTask extends AbtParentTask {
task.setFromLat(supplierResource.getLat());
task.setFromLng(supplierResource.getLng());
task.setToLat(this.scenarioInfoTmp.getSdzy().getLat());
task.setToLng(this.scenarioInfoTmp.getSdzy().getLng());
task.setToLat(fuelResource.getLat());
task.setToLng(fuelResource.getLng());
task.setStartTime(LocalDateTime.now());
task.setFromSource("general");
log.info("承担保障任务的resourceId::{}", supplierResource.getId());
@ -472,6 +472,7 @@ public class BattleRootTask extends AbtParentTask {
@Override
public void doSomeThing() {
//创建一个保障任务
ScenarioTask task = new ScenarioTask();
task.setId(IdUtils.simpleUUID());
task.setScenarioId(scenarioTask.getScenarioId());
@ -479,11 +480,11 @@ public class BattleRootTask extends AbtParentTask {
task.setTaskType("3");
task.setInsureResourceId(scenarioTask.getResourceId());
task.setSupplierNum(injured);
task.setToLat(fuelResource.getLat());
task.setToLng(fuelResource.getLng() + "");
task.setToLat(coordinate.getLat() + "");
task.setToLng(coordinate.getLng() + "");
task.setStartTime(LocalDateTime.now());
task.setFromLat(scenarioInfoTmp.getSdzy().getLat());
task.setFromLng(scenarioInfoTmp.getSdzy().getLng());
task.setFromLat(fuelResource.getLat());
task.setFromLng(fuelResource.getLng());
task.setFromSource("general");
SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task);
SupplierTask supplierTask = new SupplierTask(task, roomId);

4
src/main/resources/application-prod.properties
View File

@ -1,9 +1,9 @@
spring.datasource.dynamic.primary=dm
spring.datasource.dynamic.strict=false
spring.datasource.dynamic.datasource.dm.url=jdbc:dm://192.168.0.53:5236/SIMULATION
spring.datasource.dynamic.datasource.dm.url=jdbc:dm://127.0.0.1:5236/SIMULATION
spring.datasource.dynamic.datasource.dm.driver-class-name=dm.jdbc.driver.DmDriver
spring.datasource.dynamic.datasource.dm.username=SYSDBA
spring.datasource.dynamic.datasource.dm.password=Admin123
spring.datasource.dynamic.datasource.dm.password=SYSDBA001
spring.redis.database=0
spring.redis.host=127.0.0.1