From a40b23cbe9e1726a6862c2b203440971a610bb49 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Fri, 19 Sep 2025 15:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1=E6=B6=88?= =?UTF-8?q?=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hivekion/room/bean/BattleRootTask.java | 19 ++++++++++--------- .../scenario/entity/BattleConsume.java | 2 ++ .../resources/application-rule.properties | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index 4d8f653..4e29016 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -98,8 +98,8 @@ public class BattleRootTask extends AbtParentTask { battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getTotal()).toString()); battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getTotal()).toString()); battleParams.put("water",Double.valueOf(statisticBean.getWater().getTotal()).toString()); - battleParams.put("death",Double.valueOf(statisticBean.getPerson().getDeath()).toString()); - battleParams.put("injured",Double.valueOf(statisticBean.getPerson().getInjured()).toString()); + battleParams.put("death",Integer.valueOf(statisticBean.getPerson().getDeath()).toString()); + battleParams.put("injured",Integer.valueOf(statisticBean.getPerson().getInjured()).toString()); battleParams.put("teamLat",statisticBean.getTeam().getLat().toString()); battleParams.put("teamLng",statisticBean.getTeam().getLng().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("medical",Double.valueOf(medical - medicalConsume).toString()); battleParams.put("water",Double.valueOf(water - waterConsume).toString()); - battleParams.put("death",Long.valueOf(death - deathConsume).toString()); - battleParams.put("injured",Long.valueOf(injured - injuredConsume).toString()); + battleParams.put("death",Long.valueOf(death+deathConsume).toString()); + battleParams.put("injured",Long.valueOf(injured +injuredConsume).toString()); battleParams.put("duringTime",Long.valueOf(duringTime).toString()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), battleParams); }catch (Exception ex){ @@ -191,6 +191,7 @@ public class BattleRootTask extends AbtParentTask { battleConsume.setResourceId(scenarioTask.getResourceId()); battleConsumeService.save(battleConsume); }catch (Exception ex){ + ex.printStackTrace(); log.error("==================推送消耗數據 失败============================================",ex.getMessage()); } @@ -216,9 +217,9 @@ public class BattleRootTask extends AbtParentTask { supplierRequestService.save(supplierRequest); suppleFlagMap.put("ammunition",true) ; } - Long restNoDeath = Long.valueOf(battleConsumeMap.get("death").toString()); - Long deathConsumeRate = restNoDeath*100/battleResourceStat.getPerson().getDeath(); - if(deathConsumeRate <= Long.valueOf(death) && suppleFlagMap.get("death") == false){ + Long restDeath = Long.valueOf(battleConsumeMap.get("death").toString()); + Long deathConsumeRate = restDeath*100/battleResourceStat.getPerson().getTotal(); + if(deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false){ SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); @@ -230,8 +231,8 @@ public class BattleRootTask extends AbtParentTask { supplierRequestService.save(supplierRequest); suppleFlagMap.put("death",true) ; } - Long restNoInjured = Long.valueOf(battleConsumeMap.get("injured").toString()); - Long injuredConsumeRate = restNoInjured*100/battleResourceStat.getPerson().getDeath(); + Long restInjured = Long.valueOf(battleConsumeMap.get("injured").toString()); + Long injuredConsumeRate = restInjured*100/battleResourceStat.getPerson().getTotal(); if(Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){ SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); diff --git a/src/main/java/com/hivekion/scenario/entity/BattleConsume.java b/src/main/java/com/hivekion/scenario/entity/BattleConsume.java index 7c18d94..ef2fe86 100644 --- a/src/main/java/com/hivekion/scenario/entity/BattleConsume.java +++ b/src/main/java/com/hivekion/scenario/entity/BattleConsume.java @@ -1,5 +1,6 @@ package com.hivekion.scenario.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.math.BigDecimal; @@ -24,6 +25,7 @@ public class BattleConsume implements Serializable { private String id; @ApiModelProperty("资源编号") + @TableField(value = "resource_id") private String resourceId; private Double ammunition; diff --git a/src/main/resources/application-rule.properties b/src/main/resources/application-rule.properties index 71b684e..b73df47 100644 --- a/src/main/resources/application-rule.properties +++ b/src/main/resources/application-rule.properties @@ -1,5 +1,5 @@ -injured.warn = 20 -death.warn = 10 +injured.warn = 60 +death.warn = 56 ammunition.warn = 3 food.warn = 3 water.warn = 3