初次提交

.idea/workspace.xml

@@ -5,7 +5,35 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="af4c07b7-4ec6-4591-87e0-621479a360cc" name="更改" comment="初次提交">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/service/TaskLogicService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/service/impl/TaskLogicServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/service/StatisticService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/service/impl/StatisticServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/CodeGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/FightPowerHierarchyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/FightPowerHierarchyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/bean/CountInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/bean/CountInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/controller/StatisticController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/controller/StatisticController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/controller/SuppliesDictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/controller/SuppliesDictController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/service/SuppliesDictService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/service/SuppliesDictService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/service/impl/SuppliesDictServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/supplier/service/impl/SuppliesDictServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/CodeGenerator.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/CodeGenerator.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/Global.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/Global.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/controller/FightPowerHierarchyController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/controller/FightPowerHierarchyController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/service/ScenarioService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/service/ScenarioService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/service/impl/ScenarioServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/baseData/service/impl/ScenarioServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/environment/entity/SimtoolWeather.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/environment/entity/SimtoolWeather.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/statistic/bean/StatisticBean.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/statistic/bean/StatisticBean.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/statistic/controller/StatisticController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/statistic/controller/StatisticController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/controller/SuppliesDictController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/controller/SuppliesDictController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/entity/SuppliesDict.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/entity/SuppliesDict.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/service/SuppliesDictService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/service/SuppliesDictService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/service/impl/SuppliesDictServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/supplier/service/impl/SuppliesDictServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hivekion/ws/WsServer.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/hivekion/ws/WsServer.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/springbootmybatis-1.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/springbootmybatis-1.0.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/springbootmybatis-1.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/springbootmybatis-1.0.jar.original" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -15,6 +43,7 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -178,8 +207,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="HTTP 请求.generated-requests | #1" />
         <item itemvalue="应用程序.CodeGenerator" />
+        <item itemvalue="HTTP 请求.generated-requests | #1" />
         <item itemvalue="应用程序.SimtoolWeather" />
         <item itemvalue="JUnit.ApplicationTest.modStatus" />
         <item itemvalue="JUnit.ApplicationTest" />
@@ -248,7 +277,9 @@
       <workItem from="1757466364570" duration="7473000" />
       <workItem from="1757551777310" duration="27165000" />
       <workItem from="1757646901779" duration="1536000" />
-      <workItem from="1757745562472" duration="3031000" />
+      <workItem from="1757745562472" duration="11951000" />
+      <workItem from="1757761044173" duration="32000" />
+      <workItem from="1757813716738" duration="14062000" />
     </task>
     <task id="LOCAL-00001" summary="初次提交">
       <option name="closed" value="true" />
@@ -322,7 +353,23 @@
       <option name="project" value="LOCAL" />
       <updated>1757747521654</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="初次提交">
+      <option name="closed" value="true" />
+      <created>1757750237450</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1757750237450</updated>
+    </task>
+    <task id="LOCAL-00011" summary="初次提交">
+      <option name="closed" value="true" />
+      <created>1757818188742</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1757818188742</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -369,7 +416,7 @@
         <line-breakpoint enabled="true" type="java-method">
           <url>file://$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/TblEntityServiceImpl.java</url>
           <line>251</line>
-          <properties class="com.hivekion.baseData.service.impl.TblEntityServiceImpl" method="selectByParentId">
+          <properties class="com.hivekion.baseData.service.impl.TblEntityServiceImpl">
             <option name="EMULATED" value="true" />
             <option name="WATCH_EXIT" value="false" />
           </properties>

src/main/java/com/hivekion/CodeGenerator.java

@@ -28,12 +28,12 @@ public class CodeGenerator {
         })
         .packageConfig(builder -> {
           builder.parent("com.hivekion") // 设置父包名
-              .moduleName("scenario") // 设置模块名（可选）
+              .moduleName("baseData") // 设置模块名（可选）
               .pathInfo(Collections.singletonMap(OutputFile.xml,
                   basePath + "/src/main/resources/mapper/tbl")); // 设置mapperXml生成路径
         })
         .strategyConfig(builder -> {
-          builder.addInclude("TBL_SCENARIO_ORG_POST".toLowerCase()) // 设置需要生成的表名（多个用逗号分隔）
+          builder.addInclude("TBL_ORG_SUPPLIER".toLowerCase()) // 设置需要生成的表名（多个用逗号分隔）
               .addTablePrefix("tbl_"); // 设置过滤表前缀
         })
         .execute();

src/main/java/com/hivekion/Global.java

@@ -2,7 +2,11 @@ package com.hivekion;
 
 import com.hivekion.common.entity.RequestCmdInfo;
 import com.hivekion.common.entity.ResponseCmdInfo;
+import com.hivekion.scenario.bean.ScenarioWsParam;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 
 /**
@@ -17,5 +21,6 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class Global {
   public static BlockingQueue<RequestCmdInfo> receiveCmdInfoQueue = new LinkedBlockingQueue<>(10000);
   public static  BlockingQueue<ResponseCmdInfo<?>> sendCmdInfoQueue = new LinkedBlockingQueue<>();
+  public static Map<String,ScenarioWsParam> roomParamMap = new ConcurrentHashMap<>();
 
 }

src/main/java/com/hivekion/baseData/controller/FightPowerHierarchyController.java

@@ -4,12 +4,17 @@ import com.hivekion.baseData.domain.TblEntity;
 import com.hivekion.baseData.entity.Fightpowerhierarchy;
 import com.hivekion.baseData.entity.Fightpowerstaff;
 import com.hivekion.baseData.entity.Fightpowerweaponstaff;
+import com.hivekion.baseData.entity.OrgSupplier;
 import com.hivekion.baseData.service.FightpowerhierarchyService;
 import com.hivekion.baseData.service.FightpowerstaffService;
 import com.hivekion.baseData.service.FightpowerweaponstaffService;
 import com.hivekion.baseData.service.ITblEntityService;
+import com.hivekion.baseData.service.OrgSupplierService;
 import com.hivekion.common.entity.ResponseData;
 import com.hivekion.common.enums.ResultCodeEnum;
+import com.hivekion.common.uuid.IdUtils;
+import com.hivekion.supplier.entity.SuppliesDict;
+import com.hivekion.supplier.service.SuppliesDictService;
 import com.hivekion.unit.entity.UnitMaterialStation;
 import com.hivekion.unit.entity.UnitStation;
 import com.hivekion.unit.service.IUnitMaterialStationService;
@@ -17,6 +22,7 @@ import com.hivekion.unit.service.IUnitStationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import org.springframework.validation.BindingResult;
@@ -61,6 +67,10 @@ public class FightPowerHierarchyController extends BaseController {
   //岗位和武器武器装备的对应服务类
   @Resource
   private IUnitMaterialStationService unitMaterialStationService;
+  @Resource
+  private OrgSupplierService orgSupplierService;
+  @Resource
+  private SuppliesDictService suppliesDictService;
 
   /**
    * 保存组织机构
@@ -211,4 +221,32 @@ public class FightPowerHierarchyController extends BaseController {
     return ResponseData.success(entity);
   }
 
+  @PostMapping("/supplier/save")
+  public ResponseData<Object> saveSupplier(@RequestBody OrgSupplier orgSupplier) {
+    if (orgSupplier.getId() == null) {
+      orgSupplier.setId(IdUtils.simpleUUID());
+      orgSupplierService.save(orgSupplier);
+    } else {
+      orgSupplierService.updateById(orgSupplier);
+    }
+    return ResponseData.success(orgSupplier);
+  }
+
+  @GetMapping("/supplier/getByOrgId")
+  public ResponseData<List<OrgSupplier>> getSupplier(Integer id) {
+    Map<String, SuppliesDict> dictMap = suppliesDictService.supplierDictMap();
+    List<OrgSupplier> list = orgSupplierService.getByOrgId(id);
+    list.forEach(supplier -> {
+      if (dictMap.get(supplier.getSupplierId()) != null) {
+        supplier.setName(dictMap.get(supplier.getSupplierId()).getSupplierName());
+      }
+    });
+    return ResponseData.success(list);
+  }
+
+  @GetMapping("/supplier/remove/{id}")
+  public ResponseData<Void> removeSupplier(@PathVariable("id") String id) {
+    orgSupplierService.removeById(id);
+    return ResponseData.success(null);
+  }
 }

src/main/java/com/hivekion/baseData/service/ScenarioService.java

@@ -68,8 +68,5 @@ public interface ScenarioService extends IService<Scenario> {
 
   List<Scenario> allNoContent();
   Scenario getScenarioById(Integer id);
-  void start(Integer id,String roomId);
+
-  void stop(Integer id,String roomId);
-  void sleepWhile(Integer id,String roomId);
-  void wakeup(Integer id,String roomId);
 }

src/main/java/com/hivekion/baseData/service/impl/ScenarioServiceImpl.java

@@ -44,12 +44,7 @@ import org.springframework.stereotype.Service;
 public class ScenarioServiceImpl extends ServiceImpl<ScenarioMapper, Scenario> implements
     ScenarioService {
 
-  @Resource
+
-  private SpringGlobalTaskManager springGlobalTaskManager;
-  @Resource
-  private SimtoolWeatherService weatherService;
-  @Resource
-  private RedisUtil redisUtil;
 
   @Override
   public List<Scenario> List(Scenario scenario) {
@@ -423,64 +418,6 @@ public class ScenarioServiceImpl extends ServiceImpl<ScenarioMapper, Scenario> i
     return  this.baseMapper.selectByScenarioId(id);
   }
 
-  @Override
-  public void start(Integer id, String roomId) {
-    //查询想定中天气信息放入redis
 
-    new Thread(() -> {
-      Scenario currentScenario = this.getScenarioById(id);
-      List<SimtoolWeather> weatherList = weatherService.queryByScenarioUuid(
-          currentScenario.getGuid());
-      //放入天气数据
-      redisUtil.hset(roomId + "_" + id, "weather", weatherList);
-      redisUtil.hset(roomId + "_" + id, "duringTime", 0);
-      redisUtil.hset(roomId + "_" + id, "states", "running");
-      springGlobalTaskManager.startPerSecondTask(roomId + "_" + id + "_task", () -> {
-
-        increaseTime(currentScenario, roomId);
-        weatherTrigger(currentScenario, roomId);
-
-      });
-    }).start();
-  }
-
-  @Override
-  public void stop(Integer id, String roomId) {
-
-  }
-
-  @Override
-  public void sleepWhile(Integer id, String roomId) {
-    redisUtil.hset(roomId + "_" + id, "states", "sleep");
-  }
-
-  @Override
-  public void wakeup(Integer id, String roomId) {
-    redisUtil.hset(roomId + "_" + id, "states", "running");
-  }
-
-  private void increaseTime(Scenario currentScenario, String roomId) {
-    //获取当前状态
-    Object statusObj = redisUtil.hget(roomId + "_" + currentScenario.getId(), "status");
-    if (statusObj != null && statusObj.toString().equals("running")) {
-      Object duringObj = redisUtil.hget(roomId + "_" + currentScenario.getId(), "duringTime");
-      if (duringObj != null) {
-        int oldValue = duringObj instanceof Integer ? (Integer) duringObj : 0;
-        oldValue = oldValue + 1;
-        redisUtil.hset(roomId + "_" + currentScenario.getId(), "duringTime", oldValue);
-      }
-
-    }
-  }
-
-  /**
-   * 天气触发
-   *
-   * @param currentScenario 当前想定
-   * @param roomId          房间ID
-   */
-  private void weatherTrigger(Scenario currentScenario, String roomId) {
-
-  }
 
 }

src/main/java/com/hivekion/environment/entity/SimtoolWeather.java

@@ -29,17 +29,18 @@ public class SimtoolWeather extends SearchInputVo {
   private String guid;
 
   private String startTime;
-  @TableField(value="duration_time")
+  @TableField(value = "duration_time")
   private String durationTime;
   private String weather;
-  @TableField(value="wind_direction")
+  @TableField(value = "wind_direction")
   private String windDirection;
-  @TableField(value="wind_power")
+  @TableField(value = "wind_power")
   private String windPower;
-  @TableField(value="wind_speed")
+  @TableField(value = "wind_speed")
   private String windSpeed;
-  @TableField(value="scenario_uuid")
+  @TableField(value = "scenario_uuid")
   private String scenarioUuid;
-
+  @TableField(exist = false)
+  private String status;
 
 }

src/main/java/com/hivekion/scenario/bean/ScenarioWsParam.java

@@ -0,0 +1,18 @@
+package com.hivekion.scenario.bean;
+
+import lombok.Data;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class ScenarioWsParam {
+  //放大倍数
+  private Integer amg;
+}

src/main/java/com/hivekion/scenario/service/TaskLogicService.java

@@ -0,0 +1,27 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.scenario.entity.ScenarioTask;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public interface TaskLogicService {
+
+  //移动任务
+  void handleMoveTask(ScenarioTask task, Scenario scenario, String roomId);
+  //战斗任务
+  void handleBattleTask(ScenarioTask task, Scenario scenario, String roomId);
+  //整备
+  void restTask(ScenarioTask task,Scenario scenario, String roomId);
+
+  void supplierTask(ScenarioTask task,Scenario scenario, String roomId);
+
+
+}

src/main/java/com/hivekion/scenario/service/impl/TaskLogicServiceImpl.java

@@ -0,0 +1,39 @@
+package com.hivekion.scenario.service.impl;
+
+import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.scenario.entity.ScenarioTask;
+import com.hivekion.scenario.service.TaskLogicService;
+import org.springframework.stereotype.Service;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Service
+public class TaskLogicServiceImpl implements TaskLogicService {
+
+  @Override
+  public void handleMoveTask(ScenarioTask task, Scenario scenario, String roomId) {
+
+  }
+
+  @Override
+  public void handleBattleTask(ScenarioTask task, Scenario scenario, String roomId) {
+
+  }
+
+  @Override
+  public void restTask(ScenarioTask task, Scenario scenario, String roomId) {
+
+  }
+
+  @Override
+  public void supplierTask(ScenarioTask task, Scenario scenario, String roomId) {
+
+  }
+}

src/main/java/com/hivekion/statistic/bean/AmmunitionInfo.java

@@ -0,0 +1,14 @@
+package com.hivekion.statistic.bean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public class AmmunitionInfo extends CountInfo{
+
+}

src/main/java/com/hivekion/statistic/bean/CountInfo.java

@@ -0,0 +1,18 @@
+package com.hivekion.statistic.bean;
+
+import lombok.Data;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class CountInfo implements java.io.Serializable {
+  private double total = 0;
+  private double current = 0;
+}

src/main/java/com/hivekion/statistic/bean/FoodInfo.java

@@ -0,0 +1,14 @@
+package com.hivekion.statistic.bean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public class FoodInfo extends CountInfo{
+
+}

src/main/java/com/hivekion/statistic/bean/FuelInfo.java

@@ -0,0 +1,14 @@
+package com.hivekion.statistic.bean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public class FuelInfo extends CountInfo{
+
+}

src/main/java/com/hivekion/statistic/bean/MedicalInfo.java

@@ -0,0 +1,14 @@
+package com.hivekion.statistic.bean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public class MedicalInfo extends CountInfo{
+
+}

src/main/java/com/hivekion/statistic/bean/StatisticBean.java

@@ -15,4 +15,15 @@ import lombok.Data;
 public class StatisticBean {
   private TeamInfo team = new TeamInfo();
   private PersonInfo person =  new PersonInfo();
+  //弹药
+  private AmmunitionInfo ammunition = new AmmunitionInfo();
+  //食品
+  private FoodInfo food = new FoodInfo();
+  //水
+  private WaterInfo water = new WaterInfo();
+  //油
+  private FuelInfo fuel = new FuelInfo();
+  //药材
+  private MedicalInfo medical = new MedicalInfo();
+
 }

src/main/java/com/hivekion/statistic/bean/WaterInfo.java

@@ -0,0 +1,14 @@
+package com.hivekion.statistic.bean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public class WaterInfo extends CountInfo{
+
+}

src/main/java/com/hivekion/statistic/controller/StatisticController.java

@@ -2,6 +2,8 @@ package com.hivekion.statistic.controller;
 
 import com.hivekion.common.entity.ResponseData;
 import com.hivekion.statistic.bean.StatisticBean;
+import com.hivekion.statistic.service.StatisticService;
+import javax.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,10 +20,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/statistic")
 public class StatisticController {
-    @GetMapping("/info")
-    //todo
-    public ResponseData<StatisticBean> statistic(String  resourceId) {
 
-        return ResponseData.success(new StatisticBean());
+  @Resource
-    }
+  private StatisticService statisticService;
+
+  @GetMapping("/info")
+
+  public ResponseData<StatisticBean> statistic(String resourceId) {
+
+    return ResponseData.success(statisticService.statistic(resourceId));
+  }
 }

src/main/java/com/hivekion/statistic/service/StatisticService.java

@@ -0,0 +1,16 @@
+package com.hivekion.statistic.service;
+
+import com.hivekion.statistic.bean.StatisticBean;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+public interface StatisticService {
+  StatisticBean statistic(String  resourceId);
+}

src/main/java/com/hivekion/statistic/service/impl/StatisticServiceImpl.java

@@ -0,0 +1,84 @@
+package com.hivekion.statistic.service.impl;
+
+import com.hivekion.baseData.entity.OrgSupplier;
+import com.hivekion.baseData.service.OrgSupplierService;
+import com.hivekion.scenario.entity.ScenarioResource;
+import com.hivekion.scenario.service.ScenarioResourceService;
+import com.hivekion.statistic.bean.StatisticBean;
+import com.hivekion.statistic.service.StatisticService;
+import com.hivekion.supplier.entity.SuppliesDict;
+import com.hivekion.supplier.service.SuppliesDictService;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * [类的简要说明]
+ * <p>
+ * [详细描述，可选]
+ * <p>
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Service
+public class StatisticServiceImpl implements StatisticService {
+
+  @Resource
+  private ScenarioResourceService scenarioResourceService;
+  @Resource
+  private OrgSupplierService orgSupplierService;
+  @Resource
+  private SuppliesDictService suppliesDictService;
+
+  @Override
+  public StatisticBean statistic(String resourceId) {
+    StatisticBean statisticBean = new StatisticBean();
+    //获取分队信息
+    ScenarioResource resourceInstance = scenarioResourceService.getById(resourceId);
+    if(resourceInstance == null){
+      return statisticBean;
+    }
+    statisticBean.getTeam().setType(resourceInstance.getType());
+    statisticBean.getTeam().setLat(resourceInstance.getLat());
+    statisticBean.getTeam().setLng(resourceInstance.getLng());
+    statisticBean.getTeam().setTeamName(resourceInstance.getResourceName());
+    //获取物资信息
+    List<OrgSupplier> suppliers = orgSupplierService.getByOrgId(resourceInstance.getResourceId());
+    Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
+    suppliers.forEach(supplier -> {
+      SuppliesDict dict = supplierMap.get(supplier.getId());
+      if (dict != null) {
+        switch (dict.getCode()) {
+          case "FOOD":
+            statisticBean.getFood().setTotal(supplier.getAccount());
+            statisticBean.getFood().setCurrent(supplier.getAccount());
+            break;
+          case "WATER":
+            statisticBean.getWater().setTotal(supplier.getAccount());
+            statisticBean.getWater().setCurrent(supplier.getAccount());
+            break;
+          case "FUEL":
+            statisticBean.getFuel().setTotal(supplier.getAccount());
+            statisticBean.getFuel().setCurrent(supplier.getAccount());
+            break;
+          case "MEDICAL":
+            statisticBean.getMedical().setTotal(supplier.getAccount());
+            statisticBean.getMedical().setCurrent(supplier.getAccount());
+            break;
+
+          case "AMMUNITION":
+            statisticBean.getAmmunition().setTotal(supplier.getAccount());
+            statisticBean.getAmmunition().setCurrent(supplier.getAccount());
+            break;
+          default:
+            break;
+        }
+      }
+    });
+
+    return statisticBean;
+  }
+
+}

src/main/java/com/hivekion/supplier/controller/SuppliesDictController.java

@@ -57,6 +57,7 @@ public class SuppliesDictController {
         TreeNode treeNode = new TreeNode();
         treeNode.setKey(a.getId());
         treeNode.setData(a);
+        treeNode.setValue(a.getId());
         treeNode.setTitle(a.getSupplierName());
         childrenList.add(treeNode);
         buildChildren(treeNode, parentMap);
@@ -66,4 +67,5 @@ public class SuppliesDictController {
     }
   }
 
+
 }

src/main/java/com/hivekion/supplier/entity/SuppliesDict.java

@@ -33,9 +33,7 @@ public class SuppliesDict  implements Serializable {
   @TableField(value = "parent_id")
   private String parentId;
 
-  @ApiModelProperty("编码")
+
-  @TableField(value = "supplier_code")
-  private String supplierCode;
 
   @ApiModelProperty("名称")
   @TableField(value = "supplier_name")
@@ -46,6 +44,6 @@ public class SuppliesDict  implements Serializable {
   @TableField(value = "display_index")
   private Integer displayIndex;
 
-
+  private String code;
 
 }

src/main/java/com/hivekion/supplier/service/SuppliesDictService.java

@@ -1,8 +1,9 @@
 package com.hivekion.supplier.service;
 
-import com.hivekion.supplier.entity.SuppliesDict;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hivekion.supplier.entity.SuppliesDict;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,5 +14,8 @@ import java.util.List;
  * @since 2025-09-09
  */
 public interface SuppliesDictService extends IService<SuppliesDict> {
-   List<SuppliesDict> listSortByIndex();
+
+  List<SuppliesDict> listSortByIndex();
+  Map<String,SuppliesDict> supplierDictMap();
 }
+

src/main/java/com/hivekion/supplier/service/impl/SuppliesDictServiceImpl.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hivekion.supplier.entity.SuppliesDict;
 import com.hivekion.supplier.mapper.SuppliesDictMapper;
 import com.hivekion.supplier.service.SuppliesDictService;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 
 /**
@@ -27,4 +30,11 @@ public class SuppliesDictServiceImpl extends
     queryWrapper.orderByAsc("display_index");
     return this.list(queryWrapper);
   }
+
+  @Override
+  public Map<String, SuppliesDict> supplierDictMap() {
+    List<SuppliesDict> dataList = listSortByIndex();
+
+    return dataList.stream().collect(Collectors.toMap(SuppliesDict::getId, suppliesDict -> suppliesDict));
+  }
 }

src/main/java/com/hivekion/ws/WsServer.java

@@ -34,6 +34,7 @@ public class WsServer {
 
   private final Object lock = new Object();
 
+
   @OnOpen
   public void onOpen(Session session,
       @PathParam("room") String room, @PathParam("scenarioId") String scenarioId) {

src/test/java/com/hivekion/ApplicationTest.java

@@ -43,4 +43,5 @@ public class ApplicationTest {
       status.setModuleCode("evaluation_system");
       moduleStatusService.save(status);
     }
+
 }

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -22,6 +22,7 @@ com\hivekion\baseData\domain\TblAircraftFacilityVo\TblAircraftFacilityAddInputVo
 com\hivekion\power\bean\PowerGroup.class
 com\hivekion\baseData\domain\TblMount.class
 com\hivekion\dicData\domain\DicVo\DicWarheadTypeViewVo.class
+com\hivekion\scenario\entity\ScenarioSupplier.class
 com\hivekion\baseData\domain\TblWeaponVo\TblWeaponRecordModelViewVo.class
 com\hivekion\dicData\controller\DicLaserTargetController.class
 com\hivekion\baseData\mapper\TblSensorMapper.class
@@ -67,6 +68,7 @@ com\hivekion\baseData\domain\TblLaserDamageability.class
 com\hivekion\baseData\service\impl\TblAircraftFuelServiceImpl.class
 com\hivekion\common\exception\BusinessException.class
 com\hivekion\baseData\service\ITblAircraftTargetsService.class
+com\hivekion\scenario\mapper\ScenarioSupplierMapper.class
 com\hivekion\baseData\domain\TblFacilityMagazines.class
 com\hivekion\common\response\ResponseResult.class
 com\hivekion\dicData\service\IDicWeaponGenerationService.class
@@ -134,11 +136,13 @@ com\hivekion\baseData\domain\TblWeaponSensors.class
 com\hivekion\baseData\mapper\TblPropulsionPerformanceMapper.class
 com\hivekion\baseData\mapper\TblShipDockingFacilitiesMapper.class
 com\hivekion\dicData\domain\DicLoadoutRole.class
+com\hivekion\scenario\service\impl\ScenarioTaskServiceImpl.class
 com\hivekion\thread\SpringGlobalTaskManager.class
 com\hivekion\dicData\service\IDicCommTypeService.class
 com\hivekion\dicData\service\impl\DicWeaponGenerationServiceImpl.class
 com\hivekion\dicData\service\impl\DicAircraftCodeServiceImpl.class
 com\hivekion\baseData\domain\TblAircraftSensorsVo\TblAircraftSensorsCreateInputVo.class
+com\hivekion\baseData\entity\OrgSupplier.class
 com\hivekion\baseData\service\impl\TblSubmarineDataModelServiceImpl.class
 com\hivekion\baseData\service\ITblAircraftWarheadsService.class
 com\hivekion\baseData\controller\TblCommController.class
@@ -199,6 +203,7 @@ com\hivekion\DemoApplication.class
 com\hivekion\dicData\controller\DicSubmarinePhysicalsizeController.class
 com\hivekion\system\service\impl\SysAuthorityServiceImpl.class
 com\hivekion\baseData\domain\TblSensorVo\TblSensorFrequencySearchTrackAddInputVo.class
+com\hivekion\scenario\controller\ScenarioSupplierController.class
 com\hivekion\dicData\mapper\DicSatelliteTypeMapper.class
 com\hivekion\dicData\mapper\DicSubmarinePhysicalsizeMapper.class
 com\hivekion\dicData\service\impl\DicSubmarineCategoryServiceImpl.class
@@ -206,6 +211,7 @@ com\hivekion\baseData\domain\TblVo\TblCodes.class
 com\hivekion\baseData\domain\TblLaserDataModel.class
 com\hivekion\baseData\mapper\TblEntityMapper.class
 com\hivekion\environment\service\impl\SimtoolWeatherServiceImpl.class
+com\hivekion\statistic\service\StatisticService.class
 com\hivekion\baseData\service\ITblFacilitySignaturesService.class
 com\hivekion\environment\service\SimtoolWeatherService.class
 com\hivekion\dbData\service\IDbtoolTablecodeService.class
@@ -275,10 +281,12 @@ com\hivekion\common\entity\BaseEntity.class
 com\hivekion\system\domain\vo\sysmenu\SysMenuViewVo.class
 com\hivekion\system\domain\vo\sysmenu\SysMenuCreateInputVo.class
 com\hivekion\environment\entity\SimtoolWeather.class
+com\hivekion\scenario\mapper\ScenarioTaskMapper.class
 com\hivekion\dicData\domain\DicAircraftType.class
 com\hivekion\system\mapper\SysAreaMapper.class
 com\hivekion\baseData\service\ITblSensorFrequencySearchTrackService.class
 com\hivekion\dicData\mapper\DicWarheadTypeMapper.class
+com\hivekion\scenario\controller\ScenarioTaskController.class
 com\hivekion\baseData\domain\TblFacilityMounts.class
 com\hivekion\system\service\impl\SysRoleServiceImpl.class
 com\hivekion\baseData\domain\ImgFacilityImage.class
@@ -295,6 +303,7 @@ com\hivekion\dicData\mapper\DicTransferTypeMapper.class
 com\hivekion\dicData\mapper\DicLaserCodeMapper.class
 com\hivekion\dicData\domain\DicVo\DicMobileUnitCategoryViewVo.class
 com\hivekion\baseData\mapper\TblFacilityAircraftFacilitiesMapper.class
+com\hivekion\scenario\service\ScenarioTaskService.class
 com\hivekion\environment\entity\SimtoolEbe.class
 com\hivekion\scenario\controller\ScenarioResourceController.class
 com\hivekion\thread\HandleReceiveThread.class
@@ -350,6 +359,7 @@ com\hivekion\common\entity\vo\LoginUser.class
 com\hivekion\dicData\service\IDicWarheadExplosivesTypeService.class
 com\hivekion\dicData\service\impl\DicSensorGenerationServiceImpl.class
 com\hivekion\dicData\controller\DicFuelController.class
+com\hivekion\statistic\bean\MedicalInfo.class
 com\hivekion\common\core\SwaggerProperties.class
 com\hivekion\dicData\service\impl\DicRadiateModulationModeServiceImpl.class
 com\hivekion\test\domain\vo\project\ProjectInfoEditInputVo.class
@@ -440,6 +450,7 @@ com\hivekion\baseData\domain\TblComm.class
 com\hivekion\baseData\service\ITblShipSignaturesService.class
 com\hivekion\dicData\domain\DicLoadoutTimeofday.class
 com\hivekion\dicData\service\IDicArmorTypeService.class
+com\hivekion\baseData\service\OrgSupplierService.class
 com\hivekion\common\services\CustomUserDetailServiceImpl.class
 com\hivekion\system\domain\vo\SysCsUser\SysCsUserModelVo.class
 com\hivekion\baseData\mapper\TblSatelliteSensorsMapper.class
@@ -448,7 +459,9 @@ com\hivekion\baseData\domain\TblMountVo\TblMountSensorsAddInputVo.class
 com\hivekion\baseData\service\ITblAircraftLoadoutsService.class
 com\hivekion\baseData\domain\TblSubmarineMagazines.class
 com\hivekion\dicData\service\impl\DicAircraftCockpitVisibilityServiceImpl.class
+com\hivekion\baseData\mapper\OrgSupplierMapper.class
 com\hivekion\dicData\service\IDicSubmarineCodeService.class
+com\hivekion\statistic\bean\CountInfo.class
 com\hivekion\baseData\mapper\TblLaserRecordMapper.class
 com\hivekion\baseData\mapper\TblSubmarinePropulsionMapper.class
 com\hivekion\baseData\domain\TblPropulsionVo\TblPropulsionPerformanceViewVo.class
@@ -529,6 +542,7 @@ com\hivekion\baseData\domain\ImgSatelliteImage.class
 com\hivekion\baseData\domain\TblEntity.class
 com\hivekion\dicData\domain\DicVo\Vo\DicAddInputVo.class
 com\hivekion\dicData\mapper\DicAircraftCategoryMapper.class
+com\hivekion\statistic\bean\WaterInfo.class
 com\hivekion\dicData\domain\DicWarheadType.class
 com\hivekion\dicData\service\impl\DicSatelliteTypeServiceImpl.class
 com\hivekion\baseData\domain\TblLaserVo\TblLaserAddInputVo.class
@@ -616,6 +630,7 @@ com\hivekion\baseData\mapper\ImgSatelliteImageMapper.class
 com\hivekion\dicData\service\impl\DicWarheadExplosivesTypeServiceImpl.class
 com\hivekion\baseData\domain\TblSubmarineVo\TblSubmarineCodesAddInputVo.class
 com\hivekion\dicData\domain\DicWeaponType.class
+com\hivekion\scenario\service\impl\ScenarioSupplierServiceImpl.class
 com\hivekion\baseData\domain\TblLaserComms.class
 com\hivekion\baseData\domain\TblShipPropulsion.class
 com\hivekion\baseData\service\impl\TblLaserRecordServiceImpl.class
@@ -638,6 +653,7 @@ com\hivekion\dicData\service\impl\DicAircraftFacilityRunwaylengthServiceImpl.cla
 com\hivekion\baseData\domain\TblMountVo\TblMountCommsAddInputVo.class
 com\hivekion\system\controller\SysDeptController.class
 com\hivekion\system\domain\vo\sysmenu\SysMenuPermissionVo.class
+com\hivekion\baseData\service\impl\OrgSupplierServiceImpl.class
 com\hivekion\baseData\domain\TblVo\TblDockingFacilityViewVo.class
 com\hivekion\baseData\service\impl\TblLaserDirectorsServiceImpl.class
 com\hivekion\baseData\domain\TblWeaponVo\TblWeaponRecordAddInputVo.class
@@ -714,6 +730,7 @@ com\hivekion\baseData\domain\TblFacilityComms.class
 com\hivekion\baseData\mapper\TblMountMapper.class
 com\hivekion\baseData\mapper\TblSubmarineMagazinesMapper.class
 com\hivekion\baseData\service\impl\TblSubmarineCommsServiceImpl.class
+com\hivekion\statistic\bean\FuelInfo.class
 com\hivekion\dicData\controller\DicAircraftTypeController.class
 com\hivekion\dicData\domain\DicLaserProfileCruise.class
 com\hivekion\dicData\mapper\DicWeaponWrashooterqtyMapper.class
@@ -825,6 +842,7 @@ com\hivekion\baseData\service\ITblLaserCommsService.class
 com\hivekion\dicData\service\impl\DicCommCapabilityServiceImpl.class
 com\hivekion\baseData\domain\TblWeaponWarheads.class
 com\hivekion\baseData\service\impl\TblWarheadServiceImpl.class
+com\hivekion\scenario\bean\ScenarioWsParam.class
 com\hivekion\baseData\domain\TblAircraftPropulsionVo\TblAircraftPropulsionAddInputVo.class
 com\hivekion\baseData\domain\TblMountWeapons.class
 com\hivekion\baseData\domain\TblFacilityAircraftFacilities.class
@@ -845,6 +863,7 @@ com\hivekion\dicData\mapper\DicAircraftRunwaylengthMapper.class
 com\hivekion\dbData\domain\vo\DbtoolTablecodeViewVo.class
 com\hivekion\common\enums\ResultCodeEnum.class
 com\hivekion\baseData\domain\TblAircraftVo\TblEntityInfoVo.class
+com\hivekion\scenario\entity\ScenarioTask.class
 com\hivekion\baseData\domain\TblDockingFacility.class
 com\hivekion\baseData\domain\TblLoadoutVo\TblLoadoutWeaponsAddInputVo.class
 com\hivekion\baseData\domain\TblAircraftCommsVo\TblAircraftCommsAddInputVo.class
@@ -881,6 +900,7 @@ com\hivekion\baseData\mapper\TblLaserCodesMapper.class
 com\hivekion\common\entity\PagedResultVo.class
 com\hivekion\dicData\domain\DicVo\DicOperatorCountryViewVo.class
 com\hivekion\dicData\mapper\DicDockingFacilityPhysicalsizeMapper.class
+com\hivekion\statistic\service\impl\StatisticServiceImpl.class
 com\hivekion\baseData\service\ITblLaserTargetsService.class
 com\hivekion\dicData\service\IDicTransferTypeService.class
 com\hivekion\baseData\controller\TblLaserController.class
@@ -939,6 +959,7 @@ com\hivekion\baseData\domain\TblWeaponTargets.class
 com\hivekion\baseData\service\ITblCommRadiateOpmodeFeatureService.class
 com\hivekion\baseData\mapper\TblSatelliteDataModelMapper.class
 com\hivekion\scenario\bean\PowerTaskInfo.class
+com\hivekion\statistic\bean\AmmunitionInfo.class
 com\hivekion\common\config\WsEndpointConfig.class
 com\hivekion\dicData\service\IDicSensorRoleService.class
 com\hivekion\common\poi\TitleEntity.class
@@ -1014,6 +1035,7 @@ com\hivekion\baseData\domain\TblFacilityVo\TblFacilitySignaturesAddInputVo.class
 com\hivekion\baseData\domain\TblAircraftSignatures.class
 com\hivekion\power\bean\PowerBase.class
 com\hivekion\baseData\domain\TblShipVo\TblShipMountsAddInputVo.class
+com\hivekion\scenario\service\ScenarioSupplierService.class
 com\hivekion\dicData\domain\DicVo\DicCommCapabilityViewVo.class
 com\hivekion\baseData\mapper\BattleframedirMapper.class
 com\hivekion\dicData\controller\DicWeaponGenerationController.class
@@ -1082,6 +1104,7 @@ com\hivekion\baseData\domain\TblSensorFrequency.class
 com\hivekion\system\domain\vo\sysdict\SysDictTypeModelVo.class
 com\hivekion\dbData\domain\picture.class
 com\hivekion\dicData\service\IDicSubmarinePhysicalsizeService.class
+com\hivekion\statistic\bean\FoodInfo.class
 com\hivekion\system\service\impl\SysDictTypeService.class
 com\hivekion\baseData\domain\TblShipVo\TblShipInfoVo.class
 com\hivekion\baseData\domain\TblSubmarineDockingFacilities.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -36,6 +36,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblWeaponVo\TblWeaponTargetsAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblMagazineService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\controller\DicOperatorServiceController.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\WaterInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\controller\SysDictTypeController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblDataModelVo\TblDataModelModelVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\mapper\DicWeaponTypeMapper.java
@@ -158,6 +159,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicRadiateModulationModeServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicAircraftFacilitytypeServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\ImgLaserImageServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\service\impl\StatisticServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicVo\DicRadiateModulationModeViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblSensorFrequencyService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\controller\ScenarioController.java
@@ -183,6 +185,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblWeaponTargetsServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblSensorFrequency.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicDockingFacilityPhysicalsizeServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\entity\ScenarioTask.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSubmarineFuelServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblAircraftVo\TblAircraftAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblMountWeapons.java
@@ -226,16 +229,19 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysdict\SysDictTypeViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\controller\DicSensorCapabilityController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\IDicAircraftPhysicalsizeService.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\entity\ScenarioSupplier.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblLaserVo\TblLaserSearchInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblPropulsionServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblTargetService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblWeaponPropulsionMapper.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\entity\OrgSupplier.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblShipMagazinesService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblWarheadVo\TblWarheadAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblShipPropulsionServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\controller\SysUserController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\controller\DicWarheadCaliberController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicWarheadExplosivesTypeServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\controller\ScenarioTaskController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblLaserWarheadsServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicVo\DicOperatorCountry\DicOperatorCountryModelVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\IDicSensorCodeService.java
@@ -259,6 +265,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dbmanage\service\ITableService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblSubmarineSignaturesMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblSatelliteService.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\FoodInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysdict\SysDictDataCreateVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\tree\TreeModelNodeVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\service\impl\SysAuthorityServiceImpl.java
@@ -374,6 +381,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\bean\Group.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\entity\ResponseData.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblCommCapabilitiesService.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\OrgSupplierService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblSatelliteSignatures.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblLaserDamageabilityMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblMagazineVo\TblMagazineViewVo.java
@@ -433,6 +441,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicWarheadTypeServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicAircraftCategoryServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\entity\PagedResultVo.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\service\StatisticService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicLoadoutTimeofdayServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\test\service\IProjectService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysuser\SysUserUpdateInputVo.java
@@ -469,6 +478,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\icon\mapper\IconMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\controller\TblShipController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblEntityVo\TblEntityUpdateRemarkVo.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\OrgSupplierMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblSubmarineVo\TblSubmarineSensorsAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\IDicLoadoutTimeofdayService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblMountVo\TblMountMagazineWeaponsAddInputVo.java
@@ -507,6 +517,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblAircraftDataModelService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicSensorFrequency.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\bean\Sensors.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\CountInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicFacilityCategory.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblAircraftVo\TblEntityInfoVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblFacilityMapper.java
@@ -590,6 +601,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicAircraftFacilityPhysicalsizeServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicShipPhysicalsizeServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\redis\RedisUtil.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\FuelInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicLoadoutRoleServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\IDicSensorFrequencyService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\check\BaseChecker.java
@@ -640,6 +652,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\m
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSignatureServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\mapper\DicOperatorCountryMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\FightpowerstaffServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\AmmunitionInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\mapper\DicAircraftCodeMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\controller\DicDataModelCategoryController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicDockingFacilityPhysicalsize.java
@@ -762,6 +775,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\service\impl\SysCsUserServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblCommCapabilitiesServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicSubmarineType.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\service\ScenarioSupplierService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblAircraftSensorsService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblWeaponVo\TblWeaponSignaturesAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblWeaponSignaturesServiceImpl.java
@@ -908,6 +922,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\scheduled\JobService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblWeaponDataModelServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\controller\TblFacilityController.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\controller\ScenarioSupplierController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblFacilityVo\TblFacilityMountsAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblSubmarineAircraftFacilities.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblAircraftFacilityService.java
@@ -974,6 +989,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSubmarineServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicLaserTarget.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\mapper\DicShipTypeMapper.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\service\ScenarioTaskService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblShipSensors.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblMountDirectorsServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblLaserCommsServiceImpl.java
@@ -996,6 +1012,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblLoadoutMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSatelliteServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysrole\SysRolePermissionsModelVo.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\OrgSupplierServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\bean\GuidInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dbData\domain\vo\DbtoolTablecodeViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysoperationlog\SysOperationLogModelVo.java
@@ -1122,6 +1139,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSubmarineDockingFacilitiesServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\syscsauthority\SysRoleAuthorityViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\vo\sysuser\UserMenuVo.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\bean\ScenarioWsParam.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicVo\DicWarheadTypeViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\encrypt\AESUtil.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\common\security\JwtAuthenticationProvider.java
@@ -1144,6 +1162,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\controller\DicLaserTypeController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblLaserPropulsionVo\TblLaserPropulsionAddInputVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSubmarineMountsServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\statistic\bean\MedicalInfo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\domain\SysRole.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblWeaponWarheadsServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\mapper\ScenarioHistoryMapper.java
@@ -1249,6 +1268,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblLaserDirectorsService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblSatelliteOrbitsVo\TblSatelliteOrbitsModelVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblSatelliteMapper.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\service\impl\ScenarioSupplierServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicLaserWraselfDefenceRange.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblSubmarineMagazinesServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicWeaponGeneration.java
@@ -1304,11 +1324,13 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblWeaponService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblLaserWeapons.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblMountVo\TblMountSensorsAddInputVo.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\service\impl\ScenarioTaskServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\mapper\TblFacilityMagazinesMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblLaserDirectorsServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblAircraftSignatures.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblSensorCapabilitiesService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\service\impl\DicCommOperateStatusServiceImpl.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\mapper\ScenarioTaskMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\impl\TblShipCodesServiceImpl.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\service\ISysRoleAuthorityService.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\mapper\SysDeptMapper.java
@@ -1348,6 +1370,7 @@ D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\system\mapper\SysRolePermissionMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\domain\DicVo\DicShipCategoryViewVo.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\service\ITblFacilityCommsService.java
+D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\scenario\mapper\ScenarioSupplierMapper.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\controller\FightPowerHierarchyController.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\baseData\domain\TblAircraftDataModel.java
 D:\program-work\java-work\simulation-backend\src\main\java\com\hivekion\dicData\mapper\DicAircraftTypeMapper.java