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

战斗任务消耗资源代码

Browse Source
This commit is contained in:
wangwenhua 2025-09-19 15:30:45 +08:00
parent 4409df8984
commit a40b23cbe9
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,8 @@ public class BattleRootTask extends AbtParentTask {
battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getTotal()).toString()); battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getTotal()).toString());
battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getTotal()).toString()); battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getTotal()).toString());
battleParams.put("water",Double.valueOf(statisticBean.getWater().getTotal()).toString()); battleParams.put("water",Double.valueOf(statisticBean.getWater().getTotal()).toString());
battleParams.put("death",Double.valueOf(statisticBean.getPerson().getDeath()).toString()); battleParams.put("death",Integer.valueOf(statisticBean.getPerson().getDeath()).toString());
battleParams.put("injured",Double.valueOf(statisticBean.getPerson().getInjured()).toString()); battleParams.put("injured",Integer.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());
@ -156,8 +156,8 @@ 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("death",Long.valueOf(death+deathConsume).toString());
battleParams.put("injured",Long.valueOf(injured - injuredConsume).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){
@ -191,6 +191,7 @@ public class BattleRootTask extends AbtParentTask {
battleConsume.setResourceId(scenarioTask.getResourceId()); battleConsume.setResourceId(scenarioTask.getResourceId());
battleConsumeService.save(battleConsume); battleConsumeService.save(battleConsume);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace();
log.error("==================推送消耗數據 失败============================================",ex.getMessage()); log.error("==================推送消耗數據 失败============================================",ex.getMessage());
} }
@ -216,9 +217,9 @@ public class BattleRootTask extends AbtParentTask {
supplierRequestService.save(supplierRequest); supplierRequestService.save(supplierRequest);
suppleFlagMap.put("ammunition",true) ; suppleFlagMap.put("ammunition",true) ;
} }
Long restNoDeath = Long.valueOf(battleConsumeMap.get("death").toString()); Long restDeath = Long.valueOf(battleConsumeMap.get("death").toString());
Long deathConsumeRate = restNoDeath*100/battleResourceStat.getPerson().getDeath(); Long deathConsumeRate = restDeath*100/battleResourceStat.getPerson().getTotal();
if(deathConsumeRate <= Long.valueOf(death) && suppleFlagMap.get("death") == false){ if(deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == 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());
@ -230,8 +231,8 @@ public class BattleRootTask extends AbtParentTask {
supplierRequestService.save(supplierRequest); supplierRequestService.save(supplierRequest);
suppleFlagMap.put("death",true) ; suppleFlagMap.put("death",true) ;
} }
Long restNoInjured = Long.valueOf(battleConsumeMap.get("injured").toString()); Long restInjured = Long.valueOf(battleConsumeMap.get("injured").toString());
Long injuredConsumeRate = restNoInjured*100/battleResourceStat.getPerson().getDeath(); Long injuredConsumeRate = restInjured*100/battleResourceStat.getPerson().getTotal();
if(Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){ if(Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){
SupplierRequest supplierRequest = new SupplierRequest(); SupplierRequest supplierRequest = new SupplierRequest();
supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setId(IdUtils.simpleUUID());

2
src/main/java/com/hivekion/scenario/entity/BattleConsume.java
View File

@ -1,5 +1,6 @@
package com.hivekion.scenario.entity; package com.hivekion.scenario.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -24,6 +25,7 @@ public class BattleConsume implements Serializable {
private String id; private String id;
@ApiModelProperty("资源编号") @ApiModelProperty("资源编号")
@TableField(value = "resource_id")
private String resourceId; private String resourceId;
private Double ammunition; private Double ammunition;

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

@ -1,5 +1,5 @@
injured.warn = 20 injured.warn = 60
death.warn = 10 death.warn = 56
ammunition.warn = 3 ammunition.warn = 3
food.warn = 3 food.warn = 3
water.warn = 3 water.warn = 3