diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 81df494..c6eba74 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,35 +5,53 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -45,6 +63,7 @@
+
@@ -74,48 +93,49 @@
- {
- "keyToString": {
- "HTTP 请求.generated-requests | #1.executor": "Run",
- "JUnit.ApplicationTest.executor": "Run",
- "JUnit.ApplicationTest.hello.executor": "Run",
- "JUnit.ApplicationTest.modStatus.executor": "Run",
- "JUnit.ApplicationTest.scenarioHistory.executor": "Run",
- "Maven.springbootmybatis [clean].executor": "Run",
- "Maven.springbootmybatis [compile].executor": "Run",
- "Maven.springbootmybatis [package].executor": "Run",
- "ModuleVcsDetector.initialDetectionPerformed": "true",
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.git.unshallow": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "Spring Boot.DemoApplication.executor": "Run",
- "git-widget-placeholder": "main",
- "kotlin-language-version-configured": "true",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "project.structure.last.edited": "SDK",
- "project.structure.proportion": "0.15",
- "project.structure.side.proportion": "0.2",
- "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler",
- "vue.rearranger.settings.migration": "true",
- "应用程序.CodeGenerator.executor": "Run",
- "应用程序.JsonTest.executor": "Run",
- "应用程序.ResponseData.executor": "Run",
- "应用程序.SimtoolWeather.executor": "Run"
+
+}]]>
@@ -279,7 +299,7 @@
-
+
@@ -369,7 +389,15 @@
1757818188742
-
+
+
+ 1757830773257
+
+
+
+ 1757830773257
+
+
diff --git a/src/main/demo.html b/src/main/demo.html
new file mode 100644
index 0000000..de155ea
--- /dev/null
+++ b/src/main/demo.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Title
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/hivekion/baseData/entity/OrgSupplier.java b/src/main/java/com/hivekion/baseData/entity/OrgSupplier.java
new file mode 100644
index 0000000..46c737a
--- /dev/null
+++ b/src/main/java/com/hivekion/baseData/entity/OrgSupplier.java
@@ -0,0 +1,37 @@
+package com.hivekion.baseData.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *
+ *
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+@TableName("TBL_ORG_SUPPLIER")
+@ApiModel(value = "OrgSupplier对象", description = "")
+@Data
+public class OrgSupplier implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.INPUT)
+ private String id;
+ @TableField(value = "supplier_id")
+ private String supplierId;
+
+ private double account;
+ @TableField(value = "org_id")
+ private Integer orgId;
+ @TableField(exist = false)
+ private String name;
+
+}
+
diff --git a/src/main/java/com/hivekion/baseData/mapper/OrgSupplierMapper.java b/src/main/java/com/hivekion/baseData/mapper/OrgSupplierMapper.java
new file mode 100644
index 0000000..7557d68
--- /dev/null
+++ b/src/main/java/com/hivekion/baseData/mapper/OrgSupplierMapper.java
@@ -0,0 +1,16 @@
+package com.hivekion.baseData.mapper;
+
+import com.hivekion.baseData.entity.OrgSupplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+public interface OrgSupplierMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/hivekion/baseData/service/OrgSupplierService.java b/src/main/java/com/hivekion/baseData/service/OrgSupplierService.java
new file mode 100644
index 0000000..17f338a
--- /dev/null
+++ b/src/main/java/com/hivekion/baseData/service/OrgSupplierService.java
@@ -0,0 +1,17 @@
+package com.hivekion.baseData.service;
+
+import com.hivekion.baseData.entity.OrgSupplier;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+public interface OrgSupplierService extends IService {
+ public List getByOrgId(Integer orgId);
+}
diff --git a/src/main/java/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.java b/src/main/java/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.java
new file mode 100644
index 0000000..7492a0f
--- /dev/null
+++ b/src/main/java/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.java
@@ -0,0 +1,30 @@
+package com.hivekion.baseData.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hivekion.baseData.entity.OrgSupplier;
+import com.hivekion.baseData.mapper.OrgSupplierMapper;
+import com.hivekion.baseData.service.OrgSupplierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+@Service
+public class OrgSupplierServiceImpl extends ServiceImpl implements
+ OrgSupplierService {
+
+ @Override
+ public List getByOrgId(Integer orgId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("org_id", orgId);
+ return this.list(queryWrapper);
+ }
+}
diff --git a/src/main/java/com/hivekion/scenario/controller/ScenarioSupplierController.java b/src/main/java/com/hivekion/scenario/controller/ScenarioSupplierController.java
new file mode 100644
index 0000000..1332417
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/controller/ScenarioSupplierController.java
@@ -0,0 +1,49 @@
+package com.hivekion.scenario.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hivekion.common.entity.ResponseData;
+import com.hivekion.common.uuid.IdUtils;
+import com.hivekion.scenario.entity.ScenarioSupplier;
+import com.hivekion.scenario.service.ScenarioSupplierService;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@RestController
+@RequestMapping("/scenarioSupplier")
+public class ScenarioSupplierController {
+
+ @Resource
+ private ScenarioSupplierService scenarioSupplierService;
+
+ @PostMapping("/save")
+ public ResponseData save(@RequestBody ScenarioSupplier data) {
+ if (data.getId() == null) {
+ data.setId(IdUtils.simpleUUID());
+ scenarioSupplierService.save(data);
+ } else {
+ scenarioSupplierService.updateById(data);
+ }
+ return ResponseData.success(null);
+ }
+
+ @GetMapping("/getSupplier")
+ public ResponseData> getSupplierList(String resourceId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("resource_id", resourceId);
+ return ResponseData.success(scenarioSupplierService.list(queryWrapper));
+ }
+
+}
diff --git a/src/main/java/com/hivekion/scenario/controller/ScenarioTaskController.java b/src/main/java/com/hivekion/scenario/controller/ScenarioTaskController.java
new file mode 100644
index 0000000..52c13c0
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/controller/ScenarioTaskController.java
@@ -0,0 +1,59 @@
+package com.hivekion.scenario.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hivekion.common.entity.ResponseData;
+import com.hivekion.common.uuid.IdUtils;
+import com.hivekion.scenario.entity.ScenarioTask;
+import com.hivekion.scenario.service.ScenarioTaskService;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@RestController
+@RequestMapping("/scenarioTask")
+public class ScenarioTaskController {
+
+ @Resource
+ private ScenarioTaskService scenarioTaskService;
+
+ @PostMapping("/save")
+ public ResponseData save(@RequestBody ScenarioTask scenarioTask) {
+ if (scenarioTask.getId() == null) {
+ scenarioTask.setId(IdUtils.simpleUUID());
+ scenarioTaskService.save(scenarioTask);
+ } else {
+ scenarioTaskService.updateById(scenarioTask);
+ }
+ return ResponseData.success(null);
+ }
+
+ @PostMapping("/taskList")
+ public ResponseData> taskList(@RequestBody ScenarioTask scenarioTask) {
+
+ return ResponseData.success(scenarioTaskService.queryTaskList(scenarioTask));
+ }
+
+ @GetMapping("/remove/{id}")
+ public ResponseData remove(@PathVariable("id") String id) {
+ scenarioTaskService.removeById(id);
+ return ResponseData.success(null);
+ }
+
+ @GetMapping("/{id}")
+ public ResponseData view(@PathVariable("id") String id) {
+ return ResponseData.success(scenarioTaskService.getById(id));
+ }
+}
diff --git a/src/main/java/com/hivekion/scenario/entity/ScenarioSupplier.java b/src/main/java/com/hivekion/scenario/entity/ScenarioSupplier.java
new file mode 100644
index 0000000..1e2f8b5
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/entity/ScenarioSupplier.java
@@ -0,0 +1,41 @@
+package com.hivekion.scenario.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ *
+ *
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@TableName("TBL_SCENARIO_SUPPLIER")
+@ApiModel(value = "ScenarioSupplier对象", description = "")
+@Data
+public class ScenarioSupplier implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.INPUT)
+ private String id;
+ @TableField(value = "resource_id")
+ private String resourceId;
+ @TableField(value = "supplier_id")
+ private String supplierId;
+
+ private double total;
+ @TableField(value = "scenario_id")
+ private Integer scenarioId;
+ @TableField(value = "room_id")
+ private String roomId;
+
+ private Integer type;
+
+
+}
diff --git a/src/main/java/com/hivekion/scenario/entity/ScenarioTask.java b/src/main/java/com/hivekion/scenario/entity/ScenarioTask.java
new file mode 100644
index 0000000..1bf454a
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/entity/ScenarioTask.java
@@ -0,0 +1,61 @@
+package com.hivekion.scenario.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ *
+ *
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@TableName("TBL_SCENARIO_TASK")
+@ApiModel(value = "ScenarioTask对象", description = "")
+@Data
+public class ScenarioTask implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.INPUT)
+ private String id;
+
+ private String name;
+ @TableField(value = "start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startTime;
+ @TableField(value = "end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
+ @TableField(value = "room_id")
+ private String roomId;
+ @TableField(value = "scenario_id")
+ private Integer scenarioId;
+ @ApiModelProperty("红(0)")
+ private Integer type;
+ @TableField(value = "from_lng")
+ private String fromLng;
+ @TableField(value = "from_lat")
+ private String fromLat;
+ @TableField(value = "to_lng")
+ private String toLng;
+ @TableField(value = "to_lat")
+ private String toLat;
+
+ @ApiModelProperty("分队")
+ @TableField(value = "resource_id")
+ private String resourceId;
+ //1:移动2:战斗 3:整备; 4:弹药5: 水 6:油 7:食品
+ @TableField(value = "task_type")
+ private String taskType;
+ @TableField(exist = false)
+ private String status;
+}
diff --git a/src/main/java/com/hivekion/scenario/mapper/ScenarioSupplierMapper.java b/src/main/java/com/hivekion/scenario/mapper/ScenarioSupplierMapper.java
new file mode 100644
index 0000000..b3ea184
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/mapper/ScenarioSupplierMapper.java
@@ -0,0 +1,16 @@
+package com.hivekion.scenario.mapper;
+
+import com.hivekion.scenario.entity.ScenarioSupplier;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface ScenarioSupplierMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/hivekion/scenario/mapper/ScenarioTaskMapper.java b/src/main/java/com/hivekion/scenario/mapper/ScenarioTaskMapper.java
new file mode 100644
index 0000000..dc11267
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/mapper/ScenarioTaskMapper.java
@@ -0,0 +1,16 @@
+package com.hivekion.scenario.mapper;
+
+import com.hivekion.scenario.entity.ScenarioTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface ScenarioTaskMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/hivekion/scenario/service/ScenarioSupplierService.java b/src/main/java/com/hivekion/scenario/service/ScenarioSupplierService.java
new file mode 100644
index 0000000..8bac94c
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/service/ScenarioSupplierService.java
@@ -0,0 +1,16 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.scenario.entity.ScenarioSupplier;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface ScenarioSupplierService extends IService {
+
+}
diff --git a/src/main/java/com/hivekion/scenario/service/ScenarioTaskService.java b/src/main/java/com/hivekion/scenario/service/ScenarioTaskService.java
new file mode 100644
index 0000000..19bc678
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/service/ScenarioTaskService.java
@@ -0,0 +1,21 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.scenario.entity.ScenarioTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface ScenarioTaskService extends IService {
+ void start(Integer id,String roomId);
+ void stop(Integer id,String roomId);
+ void sleepWhile(Integer id,String roomId);
+ void wakeup(Integer id,String roomId);
+ List queryTaskList(ScenarioTask task);
+}
diff --git a/src/main/java/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.java
new file mode 100644
index 0000000..c7709ca
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hivekion.scenario.service.impl;
+
+import com.hivekion.scenario.entity.ScenarioSupplier;
+import com.hivekion.scenario.mapper.ScenarioSupplierMapper;
+import com.hivekion.scenario.service.ScenarioSupplierService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@Service
+public class ScenarioSupplierServiceImpl extends ServiceImpl implements
+ ScenarioSupplierService {
+
+}
diff --git a/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
new file mode 100644
index 0000000..c69cee8
--- /dev/null
+++ b/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
@@ -0,0 +1,133 @@
+package com.hivekion.scenario.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hivekion.Global;
+import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.baseData.service.ScenarioService;
+import com.hivekion.common.redis.RedisUtil;
+import com.hivekion.environment.entity.SimtoolWeather;
+import com.hivekion.environment.service.SimtoolWeatherService;
+import com.hivekion.scenario.entity.ScenarioTask;
+import com.hivekion.scenario.mapper.ScenarioTaskMapper;
+import com.hivekion.scenario.service.ScenarioTaskService;
+import com.hivekion.thread.SpringGlobalTaskManager;
+import java.util.List;
+import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@Service
+public class ScenarioTaskServiceImpl extends
+ ServiceImpl implements
+ ScenarioTaskService {
+
+ @Resource
+ private SpringGlobalTaskManager springGlobalTaskManager;
+ @Resource
+ private SimtoolWeatherService weatherService;
+ @Resource
+ private RedisUtil redisUtil;
+ @Resource
+ private ScenarioService scenarioService;
+
+ @Override
+ public void start(Integer id, String roomId) {
+ //想定当前持续时间
+ redisUtil.hset(roomId + "_" + id, "duringTime", 0);
+ //想定当前状态
+ redisUtil.hset(roomId + "_" + id, "states", "running");
+
+ Scenario currentScenario = scenarioService.getScenarioById(id);
+ //查询天气数据
+ List weatherList = weatherService.queryByScenarioUuid(
+ currentScenario.getGuid());
+ //放入天气数据
+ redisUtil.hset(roomId + "_" + id, "weather", weatherList);
+ //查询任务
+ ScenarioTask queryTask = new ScenarioTask();
+ queryTask.setScenarioId(id);
+ redisUtil.hset(roomId + "_" + id, "taskList", queryTaskList(queryTask));
+ new Thread(() -> {
+
+ springGlobalTaskManager.startPerSecondTask(roomId + "_" + id + "_task", () -> {
+ //时间累计
+ increaseTime(currentScenario, roomId);
+ //天气触发
+ weatherTrigger(currentScenario, roomId);
+ //任务触发
+ taskTrigger(currentScenario, roomId);
+ //物资变化
+ supplierChangeUseUp(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) {
+ int mag = Global.roomParamMap.get(currentScenario.getId() + "_" + roomId) == null ? 1
+ : Global.roomParamMap.get(currentScenario.getId() + "_" + roomId).getAmg();
+ //获取当前状态
+ 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 + mag;
+ redisUtil.hset(roomId + "_" + currentScenario.getId(), "duringTime", oldValue);
+ }
+
+ }
+ }
+
+ /**
+ * 天气触发
+ *
+ * @param currentScenario 当前想定
+ * @param roomId 房间ID
+ */
+ private void weatherTrigger(Scenario currentScenario, String roomId) {
+
+ }
+
+ private void taskTrigger(Scenario currentScenario, String roomId) {
+
+ }
+ private void supplierChangeUseUp(Scenario currentScenario, String roomId) {
+
+ }
+
+
+ @Override
+ public List queryTaskList(ScenarioTask task) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("scenario_id", task.getScenarioId());
+ if(StringUtils.isNotBlank(task.getResourceId())){
+ queryWrapper.eq("resource_id", task.getResourceId());
+ }
+ return this.list(queryWrapper);
+ }
+
+}
diff --git a/src/main/resources/mapper/tbl/OrgSupplierMapper.xml b/src/main/resources/mapper/tbl/OrgSupplierMapper.xml
new file mode 100644
index 0000000..47aebc4
--- /dev/null
+++ b/src/main/resources/mapper/tbl/OrgSupplierMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/src/main/resources/mapper/tbl/ScenarioSupplierMapper.xml b/src/main/resources/mapper/tbl/ScenarioSupplierMapper.xml
new file mode 100644
index 0000000..814673a
--- /dev/null
+++ b/src/main/resources/mapper/tbl/ScenarioSupplierMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/src/main/resources/mapper/tbl/ScenarioTaskMapper.xml b/src/main/resources/mapper/tbl/ScenarioTaskMapper.xml
new file mode 100644
index 0000000..8e746a9
--- /dev/null
+++ b/src/main/resources/mapper/tbl/ScenarioTaskMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/target/classes/com/hivekion/baseData/entity/OrgSupplier.class b/target/classes/com/hivekion/baseData/entity/OrgSupplier.class
new file mode 100644
index 0000000..959d9f8
Binary files /dev/null and b/target/classes/com/hivekion/baseData/entity/OrgSupplier.class differ
diff --git a/target/classes/com/hivekion/baseData/mapper/OrgSupplierMapper.class b/target/classes/com/hivekion/baseData/mapper/OrgSupplierMapper.class
new file mode 100644
index 0000000..39674af
Binary files /dev/null and b/target/classes/com/hivekion/baseData/mapper/OrgSupplierMapper.class differ
diff --git a/target/classes/com/hivekion/baseData/service/OrgSupplierService.class b/target/classes/com/hivekion/baseData/service/OrgSupplierService.class
new file mode 100644
index 0000000..9a6436e
Binary files /dev/null and b/target/classes/com/hivekion/baseData/service/OrgSupplierService.class differ
diff --git a/target/classes/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.class b/target/classes/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.class
new file mode 100644
index 0000000..3ab30a9
Binary files /dev/null and b/target/classes/com/hivekion/baseData/service/impl/OrgSupplierServiceImpl.class differ
diff --git a/target/classes/com/hivekion/scenario/bean/ScenarioWsParam.class b/target/classes/com/hivekion/scenario/bean/ScenarioWsParam.class
new file mode 100644
index 0000000..6ea77d1
Binary files /dev/null and b/target/classes/com/hivekion/scenario/bean/ScenarioWsParam.class differ
diff --git a/target/classes/com/hivekion/scenario/controller/ScenarioSupplierController.class b/target/classes/com/hivekion/scenario/controller/ScenarioSupplierController.class
new file mode 100644
index 0000000..2b5e249
Binary files /dev/null and b/target/classes/com/hivekion/scenario/controller/ScenarioSupplierController.class differ
diff --git a/target/classes/com/hivekion/scenario/controller/ScenarioTaskController.class b/target/classes/com/hivekion/scenario/controller/ScenarioTaskController.class
new file mode 100644
index 0000000..870cf2c
Binary files /dev/null and b/target/classes/com/hivekion/scenario/controller/ScenarioTaskController.class differ
diff --git a/target/classes/com/hivekion/scenario/entity/ScenarioSupplier.class b/target/classes/com/hivekion/scenario/entity/ScenarioSupplier.class
new file mode 100644
index 0000000..ad9739a
Binary files /dev/null and b/target/classes/com/hivekion/scenario/entity/ScenarioSupplier.class differ
diff --git a/target/classes/com/hivekion/scenario/entity/ScenarioTask.class b/target/classes/com/hivekion/scenario/entity/ScenarioTask.class
new file mode 100644
index 0000000..d17ab81
Binary files /dev/null and b/target/classes/com/hivekion/scenario/entity/ScenarioTask.class differ
diff --git a/target/classes/com/hivekion/scenario/mapper/ScenarioSupplierMapper.class b/target/classes/com/hivekion/scenario/mapper/ScenarioSupplierMapper.class
new file mode 100644
index 0000000..176c561
Binary files /dev/null and b/target/classes/com/hivekion/scenario/mapper/ScenarioSupplierMapper.class differ
diff --git a/target/classes/com/hivekion/scenario/mapper/ScenarioTaskMapper.class b/target/classes/com/hivekion/scenario/mapper/ScenarioTaskMapper.class
new file mode 100644
index 0000000..3c2f666
Binary files /dev/null and b/target/classes/com/hivekion/scenario/mapper/ScenarioTaskMapper.class differ
diff --git a/target/classes/com/hivekion/scenario/service/ScenarioSupplierService.class b/target/classes/com/hivekion/scenario/service/ScenarioSupplierService.class
new file mode 100644
index 0000000..557597c
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/ScenarioSupplierService.class differ
diff --git a/target/classes/com/hivekion/scenario/service/ScenarioTaskService.class b/target/classes/com/hivekion/scenario/service/ScenarioTaskService.class
new file mode 100644
index 0000000..586274e
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/ScenarioTaskService.class differ
diff --git a/target/classes/com/hivekion/scenario/service/TaskLogicService.class b/target/classes/com/hivekion/scenario/service/TaskLogicService.class
new file mode 100644
index 0000000..9c6a2be
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/TaskLogicService.class differ
diff --git a/target/classes/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.class b/target/classes/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.class
new file mode 100644
index 0000000..43d7619
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/impl/ScenarioSupplierServiceImpl.class differ
diff --git a/target/classes/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.class b/target/classes/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.class
new file mode 100644
index 0000000..b8c33a4
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.class differ
diff --git a/target/classes/com/hivekion/scenario/service/impl/TaskLogicServiceImpl.class b/target/classes/com/hivekion/scenario/service/impl/TaskLogicServiceImpl.class
new file mode 100644
index 0000000..b35caa8
Binary files /dev/null and b/target/classes/com/hivekion/scenario/service/impl/TaskLogicServiceImpl.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/AmmunitionInfo.class b/target/classes/com/hivekion/statistic/bean/AmmunitionInfo.class
new file mode 100644
index 0000000..d07e50b
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/AmmunitionInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/CountInfo.class b/target/classes/com/hivekion/statistic/bean/CountInfo.class
new file mode 100644
index 0000000..6dea50c
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/CountInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/FoodInfo.class b/target/classes/com/hivekion/statistic/bean/FoodInfo.class
new file mode 100644
index 0000000..831eea6
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/FoodInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/FuelInfo.class b/target/classes/com/hivekion/statistic/bean/FuelInfo.class
new file mode 100644
index 0000000..2152c22
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/FuelInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/MedicalInfo.class b/target/classes/com/hivekion/statistic/bean/MedicalInfo.class
new file mode 100644
index 0000000..0723516
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/MedicalInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/bean/WaterInfo.class b/target/classes/com/hivekion/statistic/bean/WaterInfo.class
new file mode 100644
index 0000000..de205fa
Binary files /dev/null and b/target/classes/com/hivekion/statistic/bean/WaterInfo.class differ
diff --git a/target/classes/com/hivekion/statistic/service/StatisticService.class b/target/classes/com/hivekion/statistic/service/StatisticService.class
new file mode 100644
index 0000000..56c218a
Binary files /dev/null and b/target/classes/com/hivekion/statistic/service/StatisticService.class differ
diff --git a/target/classes/com/hivekion/statistic/service/impl/StatisticServiceImpl.class b/target/classes/com/hivekion/statistic/service/impl/StatisticServiceImpl.class
new file mode 100644
index 0000000..917c1c1
Binary files /dev/null and b/target/classes/com/hivekion/statistic/service/impl/StatisticServiceImpl.class differ
diff --git a/target/classes/mapper/tbl/OrgSupplierMapper.xml b/target/classes/mapper/tbl/OrgSupplierMapper.xml
new file mode 100644
index 0000000..47aebc4
--- /dev/null
+++ b/target/classes/mapper/tbl/OrgSupplierMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/target/classes/mapper/tbl/ScenarioSupplierMapper.xml b/target/classes/mapper/tbl/ScenarioSupplierMapper.xml
new file mode 100644
index 0000000..814673a
--- /dev/null
+++ b/target/classes/mapper/tbl/ScenarioSupplierMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/target/classes/mapper/tbl/ScenarioTaskMapper.xml b/target/classes/mapper/tbl/ScenarioTaskMapper.xml
new file mode 100644
index 0000000..8e746a9
--- /dev/null
+++ b/target/classes/mapper/tbl/ScenarioTaskMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+