Merge remote-tracking branch 'origin/main'

src/main/java/com/hivekion/enums/WsCmdTypeEnum.java

@@ -14,6 +14,7 @@ import lombok.Getter;
 public enum WsCmdTypeEnum {
   PATH_UPDATE("path_update"),
   PATH_FINISHED("path_finished"),
+  STATISTIC("statistic"),
   PATH_INIT("path_init");
   @Getter
   private final String code;

src/main/java/com/hivekion/room/bean/AbtParentTask.java

@@ -1,11 +1,37 @@
 package com.hivekion.room.bean;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.hivekion.Global;
+import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.baseData.service.ScenarioService;
+import com.hivekion.common.MultiPointGeoPosition;
+import com.hivekion.common.entity.ResponseCmdInfo;
+import com.hivekion.common.redis.RedisUtil;
+import com.hivekion.enums.WsCmdTypeEnum;
 import com.hivekion.room.RoomManager;
 import com.hivekion.room.func.TaskAction;
 import com.hivekion.scenario.entity.ScenarioTask;
-
+import java.time.Duration;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -17,16 +43,27 @@ import org.springframework.web.reactive.function.client.WebClient;
  * @author LiDongYU
  * @since 2025/7/22
  */
-
+@Slf4j
 public abstract class AbtParentTask implements TaskAction {
 
-
+  /**
+   * 开始点坐标
+   */
+  private final AtomicReference<Double> startPoint = new AtomicReference<>();
+  /**
+   * 距离和坐标的对应关系
+   */
+  protected final TreeMap<Double, Coordinate> distanceInfoMap = new TreeMap<>();
   //任务数据
   protected final ScenarioTask scenarioTask;
   //房间ID
   protected final String roomId;
   //http请求
   protected WebClient webClient = WebClient.create();
+  /**
+   * 任务相对与想定的开始时间
+   */
+  private long taskRelativeTime = 0;
   //线程池
   protected ThreadPoolExecutor executor = new ThreadPoolExecutor(
       5,                      // 核心线程数
@@ -41,7 +78,10 @@ public abstract class AbtParentTask implements TaskAction {
   public AbtParentTask(ScenarioTask scenarioTask, String roomId) {
     this.scenarioTask = scenarioTask;
     this.roomId = roomId;
-
+    Scenario scenario = SpringUtil.getBean(ScenarioService.class)
+        .getScenarioById(scenarioTask.getScenarioId());
+    taskRelativeTime = Math.abs(
+        Duration.between(scenario.getStartTime(), scenarioTask.getStartTime()).getSeconds());
   }
 
   public void addScheduledExecutorServiceRefenceToRoom(
@@ -68,14 +108,15 @@ public abstract class AbtParentTask implements TaskAction {
   public long getDuringTime() {
     return RoomManager.getRoomDuringTime(this.roomId);
   }
+
   //获取房间状态
   public boolean getRoomStatus() {
     return RoomManager.isRunning(roomId);
   }
 
-  public void createBattleTaskOnTimingHandle(BizTaskOnTiming bizTaskOnTiming){
+  public void createBattleTaskOnTimingHandle(BizTaskOnTiming bizTaskOnTiming) {
     ScheduledExecutorService schedule = Executors.newScheduledThreadPool(
-            1);
+        1);
     schedule.scheduleWithFixedDelay(() -> {
       bizTaskOnTiming.execTask();
     }, 0, 10, TimeUnit.SECONDS);
@@ -83,9 +124,171 @@ public abstract class AbtParentTask implements TaskAction {
     addScheduledExecutorServiceRefenceToRoom(schedule);
   }
 
+
+  protected void initPath() {
+    try {
+
+      String url = SpringUtil.getBean(Environment.class).getProperty("path.planning.url");
+      String params = url + "?"
+          + "profile=car"
+          + "&point=" + scenarioTask.getFromLat() + ","
+          + scenarioTask.getFromLng()
+          + "&point=" + scenarioTask.getToLat() + ","
+          + scenarioTask.getToLng()
+          + "&points_encoded=false"
+          + "&algorithm=alternative_route&alternative_route.max_paths=3";
+      //获取路线信息
+      String result = webClient.get().uri(params)
+          .retrieve()
+          .bodyToMono(String.class)
+          .block();
+
+      JSONObject pointJson = JSON.parseObject(result);
+      //获取路径点
+      if (pointJson != null) {
+        JSONObject pointsObj = pointJson.getJSONArray("paths").getJSONObject(0)
+            .getJSONObject("points");
+        JSONArray coordinates = pointsObj.getJSONArray("coordinates");
+        //组装信息
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("resourceId", scenarioTask.getResourceId());
+        dataMap.put("points", coordinates);
+        //推送路径任务
+        Global.sendCmdInfoQueue.add(
+            ResponseCmdInfo.create(WsCmdTypeEnum.PATH_INIT.getCode(), roomId,
+                scenarioTask.getScenarioId(), dataMap));
+
+        SpringUtil.getBean(RedisUtil.class).hset(
+            scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+            "init_path", JSON.toJSONString(coordinates));
+
+        //计算各个点的累计距离和坐标的对应关系
+        double beforeLng = Double.parseDouble(scenarioTask.getFromLng());
+        double beforeLat = Double.parseDouble(scenarioTask.getFromLat());
+        double total = 0;
+        for (int i = 0; i < coordinates.size(); i++) {
+          JSONArray coordinate = coordinates.getJSONArray(i);
+          Double lng = coordinate.getDouble(0);
+
+          Double lat = coordinate.getDouble(1);
+
+          double distance = MultiPointGeoPosition.haversine(beforeLat, beforeLng, lat, lng);
+          //当前总距离
+          total = total + distance;
+          //定义坐标对象
+          Coordinate coordinateInfo = new Coordinate();
+          coordinateInfo.setLat(lat);
+          coordinateInfo.setLng(lng);
+
+          //记录距离和数组列表直接的索引关系
+          distanceInfoMap.put(total, coordinateInfo);
+
+          beforeLng = lng;
+          beforeLat = lat;
+
+        }
+        //设置第一个开始位置
+        startPoint.set(distanceInfoMap.firstKey());
+      }
+
+    } catch (Exception e) {
+      log.error("error::", e);
+    }
+  }
+
+  protected void updatePath(double speed, TaskAction action) {
+
+    ScheduledExecutorService schedule = Executors.newScheduledThreadPool(
+        1);
+    schedule.scheduleWithFixedDelay(() -> {
+
+      try {
+        if (this.getRoomStatus()) {
+
+          long duringTime = getDuringTime() - taskRelativeTime;
+
+          log.info("duringTime::{}", duringTime);
+          //跑动距离
+          double distance = duringTime * speed;
+          //获取大与此距离的第一个路线点key
+          Entry<Double, Coordinate> endPoint = distanceInfoMap.ceilingEntry(distance);
+          //ws数据
+          List<double[]> dataList = new ArrayList<>();
+          HashMap<Object, Object> dataMap = new HashMap<>();
+          dataMap.put("resourceId", scenarioTask.getResourceId());
+          dataMap.put("points", dataList);
+
+          if (Double.compare(distance, endPoint.getKey()) < 0) {
+            //获取小于最大值的第一个key
+            Double lowerKey = distanceInfoMap.lowerKey(endPoint.getKey());
+            //  log.info("distance::{},lowerKey::{},endPoint{}",distance,lowerKey,endPoint.getKey());
+            //获取从上一个开始节点到lowKey的数据
+            NavigableMap<Double, Coordinate> subPathMap = distanceInfoMap.subMap(startPoint.get(),
+                true, lowerKey, true);
+            for (Double key : subPathMap.keySet()) {
+              Coordinate coordinate = subPathMap.get(key);
+              dataList.add(new double[]{coordinate.getLng(), coordinate.getLat()});
+            }
+            double diff = distance - lowerKey;
+
+            //插入值
+            double[] insertPoints = MultiPointGeoPosition.pointAlong(
+                distanceInfoMap.get(lowerKey).getLat(), distanceInfoMap.get(lowerKey).getLng(),
+                endPoint.getValue().getLat(), endPoint.getValue().getLng(), diff);
+
+            dataList.add(new double[]{insertPoints[1], insertPoints[0]});
+
+            Coordinate coordinate = new Coordinate();
+            coordinate.setLat(insertPoints[0]);
+            coordinate.setLng(insertPoints[1]);
+            distanceInfoMap.put(distance, coordinate);
+            startPoint.set(distance);
+            SpringUtil.getBean(RedisUtil.class).hset(
+                scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+                "position", JSON.toJSONString(coordinate));
+
+            Global.sendCmdInfoQueue.add(
+                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_UPDATE.getCode(), roomId,
+                    scenarioTask.getScenarioId(), dataMap));
+
+          } else if (Double.compare(distance, endPoint.getKey()) == 0) {
+            NavigableMap<Double, Coordinate> subPathMap = distanceInfoMap.subMap(startPoint.get(),
+                true, endPoint.getKey(), true);
+            for (Double key : subPathMap.keySet()) {
+              Coordinate coordinate = subPathMap.get(key);
+              dataList.add(new double[]{coordinate.getLng(), coordinate.getLat()});
+            }
+
+            startPoint.set(endPoint.getKey());
+            Global.sendCmdInfoQueue.add(
+                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_UPDATE.getCode(), roomId,
+                    scenarioTask.getScenarioId(), dataMap));
+
+          } else {
+            if (action != null) {
+              action.doSomeThing();
+            }
+            //完成路径
+            Global.sendCmdInfoQueue.add(
+                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_FINISHED.getCode(), roomId,
+                    scenarioTask.getScenarioId(), dataMap));
+          }
+
+
+        }
+      } catch (Exception e) {
+        log.error("error::", e);
+      }
+
+
+    }, 0, 1, TimeUnit.SECONDS);
+
+    //房间统一管理定时器；房间关闭后，定时器销毁
+    addScheduledExecutorServiceRefenceToRoom(schedule);
+  }
 }
 
- interface BizTaskOnTiming{
+interface BizTaskOnTiming {
 
   public void execTask();
 }

src/main/java/com/hivekion/room/bean/BattleRootTask.java

@@ -189,7 +189,7 @@ public class BattleRootTask extends AbtParentTask  {
               SupplierRequest supplierRequest = new SupplierRequest();
               supplierRequest.setId(IdUtils.simpleUUID());
               supplierRequest.setFromResourceId(scenarioTask.getResourceId());
-              supplierRequest.setSupplierNum(String.valueOf(suppleAmount));
+              supplierRequest.setSupplierNum(Double.valueOf(String.valueOf(suppleAmount)));
               supplierRequest.setSupplierType("ammunition");
               supplierRequest.setGeneralTime(currentDateTime);
               supplierRequest.setLat(jsonObject.get("teamLat").toString());
@@ -201,7 +201,7 @@ public class BattleRootTask extends AbtParentTask  {
               SupplierRequest supplierRequest = new SupplierRequest();
               supplierRequest.setId(IdUtils.simpleUUID());
               supplierRequest.setFromResourceId(scenarioTask.getResourceId());
-              supplierRequest.setSupplierNum(String.valueOf(suppleDeath));
+              supplierRequest.setSupplierNum(Double.valueOf(String.valueOf(suppleDeath)));
               supplierRequest.setSupplierType("death");
               supplierRequest.setGeneralTime(currentDateTime);
               supplierRequest.setLat(jsonObject.get("teamLat").toString());
@@ -213,7 +213,7 @@ public class BattleRootTask extends AbtParentTask  {
               SupplierRequest supplierRequest = new SupplierRequest();
               supplierRequest.setId(IdUtils.simpleUUID());
               supplierRequest.setFromResourceId(scenarioTask.getResourceId());
-              supplierRequest.setSupplierNum(String.valueOf(suppleInjured));
+              supplierRequest.setSupplierNum(Double.valueOf(String.valueOf(suppleInjured)));
               supplierRequest.setSupplierType("injured");
               supplierRequest.setGeneralTime(currentDateTime);
               supplierRequest.setLat(jsonObject.get("teamLat").toString());

src/main/java/com/hivekion/room/bean/Coordinate.java

@@ -0,0 +1,19 @@
+package com.hivekion.room.bean;
+
+import lombok.Data;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class Coordinate {
+
+  private double lng;
+  private double lat;
+}

src/main/java/com/hivekion/room/bean/MoveRootTask.java

@@ -5,11 +5,17 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.hivekion.Global;
+import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.baseData.service.ScenarioService;
 import com.hivekion.common.MultiPointGeoPosition;
 import com.hivekion.common.entity.ResponseCmdInfo;
+import com.hivekion.common.redis.RedisUtil;
 import com.hivekion.enums.WsCmdTypeEnum;
 import com.hivekion.room.func.TaskAction;
 import com.hivekion.scenario.entity.ScenarioTask;
+import com.hivekion.statistic.bean.StatisticBean;
+import com.hivekion.statistic.service.impl.StatisticServiceImpl;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -41,14 +47,21 @@ public class MoveRootTask extends AbtParentTask implements TaskAction {
    * 速度 换算为100Km/小时
    */
   private final double SPEED = 27;
+
   /**
-   * 距离和坐标的对应关系
+   * 油料消耗速率
    */
-  private final TreeMap<Double, Coordinate> distanceInfoMap = new TreeMap<>();
+  private double fuelConsumption = 0;
+  private double fuelThreshold = 0;
   /**
-   * 开始点坐标
+   * 消耗任务间隔
    */
-  private final AtomicReference<Double> startPoint = new AtomicReference<>();
+  private final int consumptionTaskInterval = 5;
+  /**
+   * redis 服务类
+   */
+  private final RedisUtil redis = SpringUtil.getBean(RedisUtil.class);
+  private StatisticBean statisticBean;
 
 
   public MoveRootTask(ScenarioTask scenarioTask, String roomId) {
@@ -59,175 +72,151 @@ public class MoveRootTask extends AbtParentTask implements TaskAction {
   @Override
   public void doSomeThing() {
     log.info("move task running");
+
+    initEnv(); //初始化环境
     initPath(); //初始化路径
-    updatePath(); //更新路径
+    updatePath(SPEED,null); //更新路径
+    fuelConsumption();//油品消耗
   }
 
   /**
-   * 初始化路径
+   * 初始化环境
    */
-  private void initPath() {
+  private void initEnv() {
-    try {
 
-      String url = SpringUtil.getBean(Environment.class).getProperty("path.planning.url");
-      String params = url + "?"
-          + "profile=car"
-          + "&point=" + scenarioTask.getFromLat() + ","
-          + scenarioTask.getFromLng()
-          + "&point=" + scenarioTask.getToLat() + ","
-          + scenarioTask.getToLng()
-          + "&points_encoded=false"
-          + "&algorithm=alternative_route&alternative_route.max_paths=3";
-      //获取路线信息
-      String result = webClient.get().uri(params)
-          .retrieve()
-          .bodyToMono(String.class)
-          .block();
 
-      JSONObject pointJson = JSON.parseObject(result);
+    //获取油品消耗规则
-      //获取路径点
+    String fuelConsumptionStr = SpringUtil.getBean(Environment.class)
-      if (pointJson != null) {
+        .getProperty("fuel_spreed");
-        JSONObject pointsObj = pointJson.getJSONArray("paths").getJSONObject(0)
+    fuelConsumption = Double.parseDouble(fuelConsumptionStr == null ? "0" : fuelConsumptionStr);
-            .getJSONObject("points");
+    fuelThreshold = Double.parseDouble(SpringUtil.getBean(Environment.class)
-        JSONArray coordinates = pointsObj.getJSONArray("coordinates");
+        .getProperty("fuel.warn ","0"));
-        //组装信息
+    statisticBean = SpringUtil.getBean(StatisticServiceImpl.class)
-        Map<String, Object> dataMap = new HashMap<>();
+        .statistic(scenarioTask.getResourceId());
-        dataMap.put("resourceId", scenarioTask.getResourceId());
-        dataMap.put("points", coordinates);
-        //推送路径任务
-        Global.sendCmdInfoQueue.add(
-            ResponseCmdInfo.create(WsCmdTypeEnum.PATH_INIT.getCode(), roomId,
-                scenarioTask.getScenarioId(), dataMap));
-        log.info("init::{}", JSON.toJSONString(coordinates));
-        //计算各个点的累计距离和坐标的对应关系
-        double beforeLng = Double.parseDouble(scenarioTask.getFromLng());
-        double beforeLat = Double.parseDouble(scenarioTask.getFromLat());
-        double total = 0;
-        for (int i = 0; i < coordinates.size(); i++) {
-          JSONArray coordinate = coordinates.getJSONArray(i);
-          Double lng = coordinate.getDouble(0);
-
-          Double lat = coordinate.getDouble(1);
-
-          double distance = MultiPointGeoPosition.haversine(beforeLat, beforeLng, lat, lng);
-          //当前总距离
-          total = total + distance;
-          //定义坐标对象
-          Coordinate coordinateInfo = new Coordinate();
-          coordinateInfo.setLat(lat);
-          coordinateInfo.setLng(lng);
-
-          //记录距离和数组列表直接的索引关系
-          distanceInfoMap.put(total, coordinateInfo);
-
-          beforeLng = lng;
-          beforeLat = lat;
-
-        }
-        //设置第一个开始位置
-        startPoint.set(distanceInfoMap.firstKey());
-      }
-
-    } catch (Exception e) {
-      log.error("error::", e);
-    }
   }
 
-  private void updatePath() {
+
+
+
+
+  private void fuelConsumption() {
 
     ScheduledExecutorService schedule = Executors.newScheduledThreadPool(
         1);
     schedule.scheduleWithFixedDelay(() -> {
-
+      if (getRoomStatus()) {
-      try {
+        double currentUseUp = consumptionTaskInterval * SPEED / 1000 * fuelConsumption;
-        if (this.getRoomStatus()) {
-
-          long duringTime = getDuringTime();
-          log.info("duringTime::{}", duringTime);
-          //跑动距离
-          double distance = duringTime * SPEED;
-          //获取大与此距离的第一个路线点key
-          Entry<Double, Coordinate> endPoint = distanceInfoMap.ceilingEntry(distance);
-          //ws数据
-          List<double[]> dataList = new ArrayList<>();
-          HashMap<Object, Object> dataMap = new HashMap<>();
-          dataMap.put("resourceId", scenarioTask.getResourceId());
-          dataMap.put("points", dataList);
-
-          if (Double.compare(distance, endPoint.getKey()) < 0) {
-            //获取小于最大值的第一个key
-            Double lowerKey = distanceInfoMap.lowerKey(endPoint.getKey());
-          //  log.info("distance::{},lowerKey::{},endPoint{}",distance,lowerKey,endPoint.getKey());
-            //获取从上一个开始节点到lowKey的数据
-            NavigableMap<Double, Coordinate> subPathMap = distanceInfoMap.subMap(startPoint.get(),
-                true, lowerKey, true);
-            for (Double key : subPathMap.keySet()) {
-              Coordinate coordinate = subPathMap.get(key);
-              dataList.add(new double[]{coordinate.getLng(), coordinate.getLat()});
-            }
-            double diff =distance -  lowerKey  ;
-
-            //插入值
-            double[] insertPoints = MultiPointGeoPosition.pointAlong(
-                distanceInfoMap.get(lowerKey).getLat(), distanceInfoMap.get(lowerKey).getLng(),
-                endPoint.getValue().getLat(), endPoint.getValue().getLng(), diff);
 
 
 
-            dataList.add(new double[]{insertPoints[1], insertPoints[0]});
+        //更新redis中油品的消耗
-
+        Object currentFuelObj = redis.hget(
-            Coordinate coordinate = new  Coordinate();
+            scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
-            coordinate.setLat(insertPoints[0]);
+            "fuelConsume");
-            coordinate.setLng(insertPoints[1]);
+        if (currentFuelObj != null) {
-            distanceInfoMap.put(distance, coordinate);
+          double fuel = Double.parseDouble(currentFuelObj.toString());
-            startPoint.set(distance);
+            fuel = fuel + currentUseUp;
+            //更新值
+            redis.hset(
+                scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+                "fuelConsume", fuel);
 
 
-            Global.sendCmdInfoQueue.add(
+          double totalFuel =  statisticBean.getFuel().getTotal();
-                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_UPDATE.getCode(), roomId,
+          if(fuel*100/totalFuel<fuelThreshold){
-                    scenarioTask.getScenarioId(), dataMap));
+              //产生一个需求
-
+            //insertRequest(totalFuel-fuel,getDuringTime());
-          } else if (Double.compare(distance, endPoint.getKey()) == 0) {
-            NavigableMap<Double, Coordinate> subPathMap = distanceInfoMap.subMap(startPoint.get(),
-                true, endPoint.getKey(), true);
-            for (Double key : subPathMap.keySet()) {
-              Coordinate coordinate = subPathMap.get(key);
-              dataList.add(new double[]{coordinate.getLng(), coordinate.getLat()});
-            }
-
-            startPoint.set(endPoint.getKey());
-            Global.sendCmdInfoQueue.add(
-                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_UPDATE.getCode(), roomId,
-                    scenarioTask.getScenarioId(), dataMap));
-
-          } else {
-            //完成路径
-            Global.sendCmdInfoQueue.add(
-                ResponseCmdInfo.create(WsCmdTypeEnum.PATH_FINISHED.getCode(), roomId,
-                    scenarioTask.getScenarioId(), dataMap));
           }
-
-
-
         }
-      } catch (Exception e) {
+       // statistic();
-        log.error("error::", e);
       }
 
 
-    }, 0, 1, TimeUnit.SECONDS);
+    }, 0, consumptionTaskInterval, TimeUnit.SECONDS);
 
-    //房间统一管理定时器；房间关闭后，定时器销毁
-    addScheduledExecutorServiceRefenceToRoom(schedule);
   }
 
+//  private void statistic() {
+//
+//    Object positionObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "position");
+//    if (positionObj != null) {
+//      Coordinate coordinate = JSONObject.parseObject(positionObj.toString(), Coordinate.class);
+//      statisticBean.getTeam().setLat(coordinate.lat + "");
+//      statisticBean.getTeam().setLng(coordinate.lng + "");
+//
+//    }
+//    //设置人员受伤信息
+//    Object deathPerson = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "deathConsume");
+//    if (deathPerson != null) {
+//      statisticBean.getPerson().setDeath(Integer.parseInt(deathPerson.toString()));
+//      statisticBean.getPerson().setCurrent(
+//          statisticBean.getPerson().getTotal() - Integer.parseInt(deathPerson.toString()));
+//    }
+//    Object injuredPerson = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "injuredConsume");
+//    if (injuredPerson != null) {
+//      statisticBean.getPerson().setInjured(Integer.parseInt(injuredPerson.toString()));
+//    }
+//    //设置弹药信息
+//    Object ammunitionObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "ammunitionConsume");
+//    if (ammunitionObj != null) {
+//      statisticBean.getAmmunition().setCurrent(
+//          statisticBean.getAmmunition().getTotal() - Integer.parseInt(ammunitionObj.toString()));
+//    }
+//    //设置食品信息
+//    Object foodObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "foodConsume");
+//    if (foodObj != null) {
+//      statisticBean.getFood()
+//          .setCurrent(statisticBean.getFood().getTotal() - Integer.parseInt(foodObj.toString()));
+//    }
+//    //设置水信息
+//    Object waterObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "waterConsume");
+//    if (waterObj != null) {
+//      statisticBean.getWater()
+//          .setCurrent(statisticBean.getWater().getTotal() - Integer.parseInt(waterObj.toString()));
+//    }
+//    //设置油料信息
+//    Object fuelObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "fuelConsume");
+//    if (fuelObj != null) {
+//      statisticBean.getFuel()
+//          .setCurrent(statisticBean.getFuel().getTotal() - Integer.parseInt(fuelObj.toString()));
+//    }
+//    //设置药品信息
+//    Object medicalObj = redis.hget(
+//        scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
+//        "medicalConsume");
+//    if (medicalObj != null) {
+//      statisticBean.getMedical().setCurrent(
+//          statisticBean.getMedical().getTotal() - Integer.parseInt(medicalObj.toString()));
+//    }
+//    Global.sendCmdInfoQueue.add(
+//        ResponseCmdInfo.create(WsCmdTypeEnum.STATISTIC.getCode(), roomId,
+//            scenarioTask.getScenarioId(), statisticBean));
+//  }
+  //插入需求表
+//  private void insertRequest(double num,long second){
+//
+//
+//  }
+//  //插入消耗表
+//  private void insertConsumption (double num,long second) {
+//
+//
+//  }
 
 }
 
-@Data
-class Coordinate {
 
-  double lng;
-  double lat;
-
-}

src/main/java/com/hivekion/room/bean/SupplierTask.java

@@ -14,12 +14,11 @@ import com.hivekion.scenario.entity.ScenarioTask;
  */
 public class SupplierTask extends AbtParentTask implements TaskAction {
 
-  public SupplierTask(ScenarioTask scenarioTask,String roomId) {
+  public SupplierTask(ScenarioTask scenarioTask, String roomId) {
-    super(scenarioTask,roomId);
+    super(scenarioTask, roomId);
   }
 
 
-
   @Override
   public void doSomeThing() {
 
@@ -27,6 +26,4 @@ public class SupplierTask extends AbtParentTask implements TaskAction {
 
 
 
-
-
 }