From 4409df8984d726575d4787e1c3eb228bbcafbe22 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Fri, 19 Sep 2025 15:05:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B6=88=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 | 60 ++++--- .../controller/BattleConsumeController.java | 18 +++ .../scenario/entity/BattleConsume.java | 153 ++++++++++++++++++ .../scenario/mapper/BattleConsumeMapper.java | 16 ++ .../service/IBattleConsumeService.java | 16 ++ .../impl/BattleConsumeServiceImpl.java | 20 +++ .../resources/application-rule.properties | 10 +- .../mapper/tbl/BattleConsumeMapper.xml | 5 + 8 files changed, 273 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/hivekion/scenario/controller/BattleConsumeController.java create mode 100644 src/main/java/com/hivekion/scenario/entity/BattleConsume.java create mode 100644 src/main/java/com/hivekion/scenario/mapper/BattleConsumeMapper.java create mode 100644 src/main/java/com/hivekion/scenario/service/IBattleConsumeService.java create mode 100644 src/main/java/com/hivekion/scenario/service/impl/BattleConsumeServiceImpl.java create mode 100644 src/main/resources/mapper/tbl/BattleConsumeMapper.xml diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index b14dae1..4d8f653 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -8,7 +8,9 @@ import com.hivekion.Global; import com.hivekion.common.entity.ResponseCmdInfo; import com.hivekion.common.redis.RedisUtil; import com.hivekion.common.uuid.IdUtils; +import com.hivekion.scenario.entity.BattleConsume; import com.hivekion.scenario.entity.ScenarioTask; +import com.hivekion.scenario.service.IBattleConsumeService; import com.hivekion.statistic.bean.*; import com.hivekion.statistic.service.StatisticService; import com.hivekion.statistic.service.impl.StatisticServiceImpl; @@ -18,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.core.env.Environment; import org.springframework.util.CollectionUtils; +import javax.swing.*; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -42,6 +45,8 @@ public class BattleRootTask extends AbtParentTask { private ISupplierRequestService supplierRequestService; + private IBattleConsumeService battleConsumeService; + private static final Integer DEATH_SPREED = 3; private static final Integer INJURED_SPREED = 3; private static final Double AMMUNITION_SPREED = 2.6D; @@ -66,6 +71,9 @@ public class BattleRootTask extends AbtParentTask { if(supplierRequestService == null){ supplierRequestService = SpringUtil.getBean(ISupplierRequestService.class); } + if(battleConsumeService == null){ + battleConsumeService = SpringUtil.getBean(IBattleConsumeService.class); + } } //执行一次 @Override @@ -85,11 +93,11 @@ public class BattleRootTask extends AbtParentTask { // statisticBean.getAmmunition().getCurrent() //初始化本次战斗任务各种资源数 - battleParams.put("ammunition",Double.valueOf(statisticBean.getAmmunition().getCurrent()).toString()); - battleParams.put("food",Double.valueOf(statisticBean.getFood().getCurrent()).toString()); - battleParams.put("fuel",Double.valueOf(statisticBean.getFuel().getCurrent()).toString()); - battleParams.put("medical",Double.valueOf(statisticBean.getMedical().getCurrent()).toString()); - battleParams.put("water",Double.valueOf(statisticBean.getWater().getCurrent()).toString()); + battleParams.put("ammunition",Double.valueOf(statisticBean.getAmmunition().getTotal()).toString()); + battleParams.put("food",Double.valueOf(statisticBean.getFood().getTotal()).toString()); + 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("teamLat",statisticBean.getTeam().getLat().toString()); @@ -169,23 +177,34 @@ public class BattleRootTask extends AbtParentTask { jsonObject.put("teamLng",teamLng); sendConsumeMsg.setData(jsonObject); Global.sendCmdInfoQueue.add(sendConsumeMsg); + BattleConsume battleConsume = new BattleConsume(); + battleConsume.setLat(teamLat); + battleConsume.setLng(teamLng); + battleConsume.setId(IdUtils.simpleUUID()); + battleConsume.setAmmunition(ammunitionConsume); + battleConsume.setDeath(Integer.valueOf(deathConsume.toString())); + battleConsume.setInjured(Integer.valueOf(injuredConsume.toString())); + battleConsume.setFood(foodConsume); + battleConsume.setFuel(fuelConsume); + battleConsume.setMedical(medicalConsume); + battleConsume.setWater(waterConsume); + battleConsume.setResourceId(scenarioTask.getResourceId()); + battleConsumeService.save(battleConsume); }catch (Exception ex){ log.error("==================推送消耗數據 失败============================================",ex.getMessage()); } try { LocalDateTime currentDateTime = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - String death = SpringUtil.getBean(Environment.class).getProperty("battle.death.warn"); - String injured = SpringUtil.getBean(Environment.class).getProperty("battle.injured.warn"); - String ammunition = SpringUtil.getBean(Environment.class).getProperty("battle.ammunition.warn"); + String death = SpringUtil.getBean(Environment.class).getProperty("death.warn"); + String injured = SpringUtil.getBean(Environment.class).getProperty("injured.warn"); + String ammunition = SpringUtil.getBean(Environment.class).getProperty("ammunition.warn"); log.info("===========person ammunition==={}===={}====={}========",death,injured,ammunition); -// String food = SpringUtil.getBean(Environment.class).getProperty("battle.food.warn"); -// String water = SpringUtil.getBean(Environment.class).getProperty("battle.water.warn"); -// String fuel = SpringUtil.getBean(Environment.class).getProperty("battle.fuel.warn"); -// String medical = SpringUtil.getBean(Environment.class).getProperty("battle.medical.warn"); - - if(Double.valueOf(battleParams.get("ammunition").toString()) <= Double.valueOf(ammunition) && suppleFlagMap.get("ammunition") == false){ - + HashMap battleConsumeMap = (HashMap) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId()); + Double restAmmunition = Double.valueOf(battleConsumeMap.get("ammunition").toString()); + StatisticBean battleResourceStat = statisticService.statistic(scenarioTask.getResourceId()); + Double ammunitionConsumeRate = restAmmunition/battleResourceStat.getAmmunition().getTotal()*100; + if(Double.valueOf(ammunitionConsumeRate) <= Double.valueOf(ammunition) && suppleFlagMap.get("ammunition") == false){ SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); @@ -197,7 +216,9 @@ public class BattleRootTask extends AbtParentTask { supplierRequestService.save(supplierRequest); suppleFlagMap.put("ammunition",true) ; } - if(Long.valueOf(battleParams.get("death").toString()) <= Long.valueOf(death) && suppleFlagMap.get("death") == false){ + Long restNoDeath = Long.valueOf(battleConsumeMap.get("death").toString()); + Long deathConsumeRate = restNoDeath*100/battleResourceStat.getPerson().getDeath(); + if(deathConsumeRate <= Long.valueOf(death) && suppleFlagMap.get("death") == false){ SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); @@ -209,7 +230,9 @@ public class BattleRootTask extends AbtParentTask { supplierRequestService.save(supplierRequest); suppleFlagMap.put("death",true) ; } - if(Long.valueOf(battleParams.get("injured").toString()) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){ + Long restNoInjured = Long.valueOf(battleConsumeMap.get("injured").toString()); + Long injuredConsumeRate = restNoInjured*100/battleResourceStat.getPerson().getDeath(); + if(Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false){ SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); @@ -229,14 +252,11 @@ public class BattleRootTask extends AbtParentTask { } }); - } - } - } diff --git a/src/main/java/com/hivekion/scenario/controller/BattleConsumeController.java b/src/main/java/com/hivekion/scenario/controller/BattleConsumeController.java new file mode 100644 index 0000000..cb17d98 --- /dev/null +++ b/src/main/java/com/hivekion/scenario/controller/BattleConsumeController.java @@ -0,0 +1,18 @@ +package com.hivekion.scenario.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.stereotype.Controller; + +/** + *

+ * 战斗消耗 前端控制器 + *

+ * + * @author liDongYu + * @since 2025-09-19 + */ +@Controller +@RequestMapping("/scenario/battleConsume") +public class BattleConsumeController { + +} diff --git a/src/main/java/com/hivekion/scenario/entity/BattleConsume.java b/src/main/java/com/hivekion/scenario/entity/BattleConsume.java new file mode 100644 index 0000000..7c18d94 --- /dev/null +++ b/src/main/java/com/hivekion/scenario/entity/BattleConsume.java @@ -0,0 +1,153 @@ +package com.hivekion.scenario.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 战斗消耗 + *

+ * + * @author liDongYu + * @since 2025-09-19 + */ +@TableName("TBL_BATTLE_CONSUME") +@ApiModel(value = "BattleConsume对象", description = "战斗消耗") +public class BattleConsume implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("物理主键") + private String id; + + @ApiModelProperty("资源编号") + private String resourceId; + + private Double ammunition; + + private Integer death; + + private Integer injured; + + private Double fuel; + + private Double food; + + private Double water; + + private Double medical; + + private String lat; + + private String lng; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + + + public Integer getDeath() { + return death; + } + + public void setDeath(Integer death) { + this.death = death; + } + + public Integer getInjured() { + return injured; + } + + public void setInjured(Integer injured) { + this.injured = injured; + } + + public Double getAmmunition() { + return ammunition; + } + + public void setAmmunition(Double ammunition) { + this.ammunition = ammunition; + } + + public Double getFuel() { + return fuel; + } + + public void setFuel(Double fuel) { + this.fuel = fuel; + } + + public Double getFood() { + return food; + } + + public void setFood(Double food) { + this.food = food; + } + + public Double getWater() { + return water; + } + + public void setWater(Double water) { + this.water = water; + } + + public Double getMedical() { + return medical; + } + + public void setMedical(Double medical) { + this.medical = medical; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + @Override + public String toString() { + return "BattleConsume{" + + "id = " + id + + ", resourceId = " + resourceId + + ", ammunition = " + ammunition + + ", death = " + death + + ", injured = " + injured + + ", fuel = " + fuel + + ", food = " + food + + ", water = " + water + + ", medical = " + medical + + ", lat = " + lat + + ", lng = " + lng + + "}"; + } +} diff --git a/src/main/java/com/hivekion/scenario/mapper/BattleConsumeMapper.java b/src/main/java/com/hivekion/scenario/mapper/BattleConsumeMapper.java new file mode 100644 index 0000000..e8f29e7 --- /dev/null +++ b/src/main/java/com/hivekion/scenario/mapper/BattleConsumeMapper.java @@ -0,0 +1,16 @@ +package com.hivekion.scenario.mapper; + +import com.hivekion.scenario.entity.BattleConsume; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 战斗消耗 Mapper 接口 + *

+ * + * @author liDongYu + * @since 2025-09-19 + */ +public interface BattleConsumeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/hivekion/scenario/service/IBattleConsumeService.java b/src/main/java/com/hivekion/scenario/service/IBattleConsumeService.java new file mode 100644 index 0000000..6d74af7 --- /dev/null +++ b/src/main/java/com/hivekion/scenario/service/IBattleConsumeService.java @@ -0,0 +1,16 @@ +package com.hivekion.scenario.service; + +import com.hivekion.scenario.entity.BattleConsume; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 战斗消耗 服务类 + *

+ * + * @author liDongYu + * @since 2025-09-19 + */ +public interface IBattleConsumeService extends IService { + +} diff --git a/src/main/java/com/hivekion/scenario/service/impl/BattleConsumeServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/BattleConsumeServiceImpl.java new file mode 100644 index 0000000..3b5c151 --- /dev/null +++ b/src/main/java/com/hivekion/scenario/service/impl/BattleConsumeServiceImpl.java @@ -0,0 +1,20 @@ +package com.hivekion.scenario.service.impl; + +import com.hivekion.scenario.entity.BattleConsume; +import com.hivekion.scenario.mapper.BattleConsumeMapper; +import com.hivekion.scenario.service.IBattleConsumeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 战斗消耗 服务实现类 + *

+ * + * @author liDongYu + * @since 2025-09-19 + */ +@Service +public class BattleConsumeServiceImpl extends ServiceImpl implements IBattleConsumeService { + +} diff --git a/src/main/resources/application-rule.properties b/src/main/resources/application-rule.properties index 853a04d..71b684e 100644 --- a/src/main/resources/application-rule.properties +++ b/src/main/resources/application-rule.properties @@ -7,8 +7,8 @@ fuel.warn = 2 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; \ No newline at end of file +ammunition.spreed = 2.6; +food.spreed = 2.3; +water.spreed = 3.6; +fuel.spreed = 3.6; +medical.spreed = 1.6; \ No newline at end of file diff --git a/src/main/resources/mapper/tbl/BattleConsumeMapper.xml b/src/main/resources/mapper/tbl/BattleConsumeMapper.xml new file mode 100644 index 0000000..8537969 --- /dev/null +++ b/src/main/resources/mapper/tbl/BattleConsumeMapper.xml @@ -0,0 +1,5 @@ + + + + + From a40b23cbe9e1726a6862c2b203440971a610bb49 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Fri, 19 Sep 2025 15:30:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B6=88=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 From 7d144a39bbaf88ba987877c66534ef011baa4342 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Fri, 19 Sep 2025 15:43:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B6=88=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 --- src/main/java/com/hivekion/room/bean/BattleRootTask.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index 4e29016..e997018 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -98,6 +98,7 @@ 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("person",Integer.valueOf(statisticBean.getPerson().getTotal()).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()); @@ -182,8 +183,8 @@ public class BattleRootTask extends AbtParentTask { battleConsume.setLng(teamLng); battleConsume.setId(IdUtils.simpleUUID()); battleConsume.setAmmunition(ammunitionConsume); - battleConsume.setDeath(Integer.valueOf(deathConsume.toString())); - battleConsume.setInjured(Integer.valueOf(injuredConsume.toString())); + battleConsume.setDeath(Integer.valueOf(Double.valueOf(deathConsume).intValue())); + battleConsume.setInjured(Integer.valueOf(Double.valueOf(injuredConsume).intValue())); battleConsume.setFood(foodConsume); battleConsume.setFuel(fuelConsume); battleConsume.setMedical(medicalConsume);