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

Compare commits

base: liyudong:fd215d72fcb6d993fde82caf094eb4b30822db8e
Branches Tags
liyudong:main
..
compare: liyudong:8ce2e384f4830b854c783e55e4599876ff5a5b73
Branches Tags
liyudong:main

No commits in common. "fd215d72fcb6d993fde82caf094eb4b30822db8e" and "8ce2e384f4830b854c783e55e4599876ff5a5b73" have entirely different histories.
fd215d72fc ... 8ce2e384f4

2 changed files with 24 additions and 53 deletions
Show Stats Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package com.hivekion.room.bean;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.hivekion.Global; import com.hivekion.Global;
import com.hivekion.common.entity.ResponseCmdInfo; import com.hivekion.common.entity.ResponseCmdInfo;
@ -42,8 +41,8 @@ public class BattleRootTask extends AbtParentTask {
private ISupplierRequestService supplierRequestService; private ISupplierRequestService supplierRequestService;
private static final Integer DEATH_SPREED = 3; private static final Double TEAM_SPREED = 1.2D;
private static final Integer INJURED_SPREED = 3; private static final Double PERSON_SPREED = 3D;
private static final Double AMMUNITION_SPREED = 2.6D; private static final Double AMMUNITION_SPREED = 2.6D;
private static final Double FOOD_SPREED = 2.3D; private static final Double FOOD_SPREED = 2.3D;
private static final Double WATER_SPREED = 3.6D; private static final Double WATER_SPREED = 3.6D;
@ -85,33 +84,30 @@ public class BattleRootTask extends AbtParentTask {
// statisticBean.getAmmunition().getCurrent() // statisticBean.getAmmunition().getCurrent()
//初始化本次战斗任务各种资源数 //初始化本次战斗任务各种资源数
battleParams.put("ammunition",Double.valueOf(statisticBean.getAmmunition().getCurrent()).toString()); battleParams.put("ammunition",Double.valueOf(statisticBean.getAmmunition().getCurrent()).toString());
battleParams.put("food",Double.valueOf(statisticBean.getFood().getCurrent()).toString()); battleParams.put("food",Double.valueOf(statisticBean.getFood().getCurrent()).toString());
battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getCurrent()).toString()); battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getCurrent()).toString());
battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getCurrent()).toString()); battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getCurrent()).toString());
battleParams.put("water",Double.valueOf(statisticBean.getWater().getCurrent()).toString()); battleParams.put("water",Double.valueOf(statisticBean.getWater().getCurrent()).toString());
battleParams.put("death",Double.valueOf(statisticBean.getPerson().getDeath()).toString()); battleParams.put("person",Double.valueOf(statisticBean.getPerson().getCurrent()).toString());
battleParams.put("injured",Double.valueOf(statisticBean.getPerson().getInjured()).toString());
battleParams.put("teamLat",statisticBean.getTeam().getLat().toString()); battleParams.put("teamLat",statisticBean.getTeam().getLat().toString());
battleParams.put("teamLng",statisticBean.getTeam().getLng().toString()); battleParams.put("teamLng",statisticBean.getTeam().getLng().toString());
battleParams.put("duringTime",Long.valueOf(initDuringTime).toString()); battleParams.put("duringTime",Long.valueOf(initDuringTime).toString());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),battleParams); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),battleParams);
log.info("===============================初始化本次战斗任务各种资源数===================================="); log.info("===============================初始化本次战斗任务各种资源数====================================");
double suppleAmount =statisticBean.getAmmunition().getTotal(); double suppleAmount =statisticBean.getAmmunition().getTotal();
int suppleDeath =statisticBean.getPerson().getDeath(); double supplePerson =statisticBean.getPerson().getTotal();
int suppleInjured =statisticBean.getPerson().getInjured();
final Map<String,Boolean> suppleFlagMap = new HashMap<>(); final Map<String,Boolean> suppleFlagMap = new HashMap<>();
suppleFlagMap.put("ammunition",false); suppleFlagMap.put("ammunition",false);
suppleFlagMap.put("death",false); suppleFlagMap.put("person",false);
suppleFlagMap.put("injured",false);
//定时检查统计各种资源消耗量 //定时检查统计各种资源消耗量
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; Double personConsume = null;
Long injuredConsume = null;
Double ammunitionConsume = null; Double ammunitionConsume = null;
Double foodConsume = null; Double foodConsume = null;
Double waterConsume = null; Double waterConsume = null;
@ -130,13 +126,11 @@ public class BattleRootTask extends AbtParentTask {
double fuel = Double.valueOf(battleParams.get("fuel").toString()); double fuel = Double.valueOf(battleParams.get("fuel").toString());
double medical = Double.valueOf(battleParams.get("medical").toString()); double medical = Double.valueOf(battleParams.get("medical").toString());
double water = Double.valueOf(battleParams.get("water").toString()); double water = Double.valueOf(battleParams.get("water").toString());
long death = Long.valueOf(battleParams.get("death").toString()); double person = Double.valueOf(battleParams.get("person").toString());
long injured = Long.valueOf(battleParams.get("injured").toString());
teamLat = battleParams.get( "teamLat").toString(); teamLat = battleParams.get( "teamLat").toString();
teamLng = battleParams.get( "teamLng").toString(); teamLng = battleParams.get( "teamLng").toString();
// //
deathConsume = DEATH_SPREED * intervalDuringTime; personConsume = intervalDuringTime * PERSON_SPREED;
injuredConsume = INJURED_SPREED * intervalDuringTime;
ammunitionConsume = intervalDuringTime * AMMUNITION_SPREED; ammunitionConsume = intervalDuringTime * AMMUNITION_SPREED;
foodConsume = intervalDuringTime * FOOD_SPREED; foodConsume = intervalDuringTime * FOOD_SPREED;
waterConsume = intervalDuringTime * WATER_SPREED; waterConsume = intervalDuringTime * WATER_SPREED;
@ -148,8 +142,7 @@ public class BattleRootTask extends AbtParentTask {
battleParams.put("fuel",Double.valueOf(fuel - fuelConsume).toString()); battleParams.put("fuel",Double.valueOf(fuel - fuelConsume).toString());
battleParams.put("medical",Double.valueOf(medical - medicalConsume).toString()); battleParams.put("medical",Double.valueOf(medical - medicalConsume).toString());
battleParams.put("water",Double.valueOf(water - waterConsume).toString()); battleParams.put("water",Double.valueOf(water - waterConsume).toString());
battleParams.put("death",Long.valueOf(death - deathConsume).toString()); battleParams.put("person",Double.valueOf(person - personConsume).toString());
battleParams.put("injured",Long.valueOf(injured - injuredConsume).toString());
battleParams.put("duringTime",Long.valueOf(duringTime).toString()); battleParams.put("duringTime",Long.valueOf(duringTime).toString());
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), battleParams); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), battleParams);
}catch (Exception ex){ }catch (Exception ex){
@ -158,8 +151,7 @@ public class BattleRootTask extends AbtParentTask {
try { try {
//推送消耗數據 //推送消耗數據
ResponseCmdInfo<JSONObject> sendConsumeMsg = new ResponseCmdInfo<>(); ResponseCmdInfo<JSONObject> sendConsumeMsg = new ResponseCmdInfo<>();
jsonObject.put("deathConsume", deathConsume); jsonObject.put("personConsume", personConsume);
jsonObject.put("injuredConsume", injuredConsume);
jsonObject.put("ammunitionConsume", ammunitionConsume); jsonObject.put("ammunitionConsume", ammunitionConsume);
jsonObject.put("foodConsume", foodConsume); jsonObject.put("foodConsume", foodConsume);
jsonObject.put("waterConsume", waterConsume); jsonObject.put("waterConsume", waterConsume);
@ -175,10 +167,9 @@ public class BattleRootTask extends AbtParentTask {
try { try {
LocalDateTime currentDateTime = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); LocalDateTime currentDateTime = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
String death = SpringUtil.getBean(Environment.class).getProperty("battle.death.warn"); String person = SpringUtil.getBean(Environment.class).getProperty("battle.person.warn");
String injured = SpringUtil.getBean(Environment.class).getProperty("battle.injured.warn");
String ammunition = SpringUtil.getBean(Environment.class).getProperty("battle.ammunition.warn"); String ammunition = SpringUtil.getBean(Environment.class).getProperty("battle.ammunition.warn");
log.info("===========person ammunition==={}===={}====={}========",death,injured,ammunition); log.info("===========person ammunition======={}====={}========",person,ammunition);
// String food = SpringUtil.getBean(Environment.class).getProperty("battle.food.warn"); // String food = SpringUtil.getBean(Environment.class).getProperty("battle.food.warn");
// String water = SpringUtil.getBean(Environment.class).getProperty("battle.water.warn"); // String water = SpringUtil.getBean(Environment.class).getProperty("battle.water.warn");
// String fuel = SpringUtil.getBean(Environment.class).getProperty("battle.fuel.warn"); // String fuel = SpringUtil.getBean(Environment.class).getProperty("battle.fuel.warn");
@ -189,7 +180,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(suppleAmount)); supplierRequest.setSupplierNum(suppleAmount);
supplierRequest.setSupplierType("ammunition"); supplierRequest.setSupplierType("ammunition");
supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setGeneralTime(currentDateTime);
supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLat(jsonObject.get("teamLat").toString());
@ -197,29 +188,17 @@ public class BattleRootTask extends AbtParentTask {
supplierRequestService.save(supplierRequest); supplierRequestService.save(supplierRequest);
suppleFlagMap.put("ammunition",true) ; suppleFlagMap.put("ammunition",true) ;
} }
if(Long.valueOf(battleParams.get("death").toString()) <= Long.valueOf(death) && suppleFlagMap.get("death") == false){ if(Double.valueOf(battleParams.get("person").toString()) <= Double.valueOf(person) && suppleFlagMap.get("person") == false){
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(supplePerson);
supplierRequest.setSupplierType("death"); supplierRequest.setSupplierType("person");
supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setGeneralTime(currentDateTime);
supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLat(jsonObject.get("teamLat").toString());
supplierRequest.setLng(jsonObject.get("teamLng").toString()); supplierRequest.setLng(jsonObject.get("teamLng").toString());
supplierRequestService.save(supplierRequest); supplierRequestService.save(supplierRequest);
suppleFlagMap.put("death",true) ; suppleFlagMap.put("person",true) ;
}
if(Long.valueOf(battleParams.get("injured").toString()) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){
SupplierRequest supplierRequest = new SupplierRequest();
supplierRequest.setId(IdUtils.simpleUUID());
supplierRequest.setFromResourceId(scenarioTask.getResourceId());
supplierRequest.setSupplierNum(String.valueOf(suppleInjured));
supplierRequest.setSupplierType("injured");
supplierRequest.setGeneralTime(currentDateTime);
supplierRequest.setLat(jsonObject.get("teamLat").toString());
supplierRequest.setLng(jsonObject.get("teamLng").toString());
supplierRequestService.save(supplierRequest);
suppleFlagMap.put("injured",true) ;
} }
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();

20
src/main/resources/application-rule.properties
View File

@ -1,14 +1,6 @@
injured.warn = 20 battle.person.warn = 2
death.warn = 10 battle.ammunition.warn = 3
ammunition.warn = 3 battle.food.warn = 3
food.warn = 3 battle.water.warn = 3
water.warn = 3 battle.fuel.warn = 2
fuel.warn = 2 battle.medical.warn = 1
medical.warn = 1
death.spreed = 3;
injured.spreed = 3;
ammunition_spreed = 2.6;
food_spreed = 2.3;
water_spreed = 3.6;
fuel_spreed = 3.6;
medical_spreed = 1.6;