From 40974c395f6b104065a5f81b7300445db2ddc549 Mon Sep 17 00:00:00 2001 From: wanglei <34475144@qq.com> Date: Wed, 17 Sep 2025 22:02:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DbtoolController.java | 2 +- .../com/hivekion/enums/DemandStatusEnum.java | 19 +++++++++++++++++++ .../com/hivekion/enums/TaskStatusEnum.java | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) rename src/main/java/com/hivekion/dbData/{controller => domain}/DbtoolController.java (97%) create mode 100644 src/main/java/com/hivekion/enums/DemandStatusEnum.java create mode 100644 src/main/java/com/hivekion/enums/TaskStatusEnum.java diff --git a/src/main/java/com/hivekion/dbData/controller/DbtoolController.java b/src/main/java/com/hivekion/dbData/domain/DbtoolController.java similarity index 97% rename from src/main/java/com/hivekion/dbData/controller/DbtoolController.java rename to src/main/java/com/hivekion/dbData/domain/DbtoolController.java index 7b98290..4549110 100644 --- a/src/main/java/com/hivekion/dbData/controller/DbtoolController.java +++ b/src/main/java/com/hivekion/dbData/domain/DbtoolController.java @@ -1,4 +1,4 @@ -package com.hivekion.dbData.controller; +package com.hivekion.dbData.domain; import com.hivekion.common.annotation.AutoLog; import com.hivekion.common.enums.OperationTypeEnum; diff --git a/src/main/java/com/hivekion/enums/DemandStatusEnum.java b/src/main/java/com/hivekion/enums/DemandStatusEnum.java new file mode 100644 index 0000000..d933d53 --- /dev/null +++ b/src/main/java/com/hivekion/enums/DemandStatusEnum.java @@ -0,0 +1,19 @@ +package com.hivekion.enums; + +import lombok.Getter; + +public enum DemandStatusEnum { + //需求状态 //需求状态 1：未处理 2：已升级 3：等待中 4：正在处理中 5：已完成 + DEMAND_NPODEAL(1), + DEMAND_LEVEL(2), + DEMAND_WATTING(3), + DEMAND_DEALING(4), + DEMAND_SUCCESSED(5); + + @Getter + private int code; + + DemandStatusEnum(int code) { + this.code = code; + } +} diff --git a/src/main/java/com/hivekion/enums/TaskStatusEnum.java b/src/main/java/com/hivekion/enums/TaskStatusEnum.java new file mode 100644 index 0000000..c0590ff --- /dev/null +++ b/src/main/java/com/hivekion/enums/TaskStatusEnum.java @@ -0,0 +1,17 @@ +package com.hivekion.enums; + +import lombok.Getter; + +public enum TaskStatusEnum { + //任务状态 1-等待中 2-运输中 3-已完成 + TASK_WAITTING(1), + TASK_TRANSLATING(2), + TASK_SUCCESSED(3); + + @Getter + private int code; + + TaskStatusEnum(int code) { + this.code = code; + } +} From 0c226aa93e9003c8e3dba545fff5f42fffdcbdfb Mon Sep 17 00:00:00 2001 From: wanglei <34475144@qq.com> Date: Mon, 22 Sep 2025 22:20:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=96=97?= =?UTF-8?q?=E4=BF=9D=E9=9A=9C=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hivekion/room/bean/BattleRootTask.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index 2d4271c..d84ddcb 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -57,7 +57,7 @@ public class BattleRootTask extends AbtParentTask { private IBattleConsumeService battleConsumeService; - private ScenarioInfo scenarioInfo; + private ScenarioInfo scenarioInfoTmp; private static final Double FOOD_SPREED = 0.3D; private static final Double WATER_SPREED = 0.1D; @@ -92,7 +92,7 @@ public class BattleRootTask extends AbtParentTask { redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"duringTime",String.valueOf(initDuringTime)); String jsonStr = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); ScenarioInfo scenarioInfo =JSONObject.parseObject(jsonStr,ScenarioInfo.class); - this.scenarioInfo = scenarioInfo; + this.scenarioInfoTmp = scenarioInfo; log.info("===============================初始化本次战斗任务各种资源数===================================="); double suppleAmount =scenarioInfo.getAmmunition().getTotal(); int suppleDeath =scenarioInfo.getPerson().getDeath(); @@ -433,25 +433,25 @@ public class BattleRootTask extends AbtParentTask { Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId()); - if ("HOSPITAL".equals(teaminfo.getRoleCode())) { + if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) { supplierResource = resource; break; } } if (supplierResource == null) { - log.error("找不到对应的医院分队"); + log.error("找不到对应的医疗保障分队"); return; } //找出医院 List resources = SpringUtil.getBean(ScenarioResourceServiceImpl.class) .selectResourceByRoleCode(scenarioTask.getScenarioId(), "HOSPITAL"); if (resources.isEmpty()) { - log.error("找不到医院仓库"); + log.error("找不到医院"); return; } - produceMoveTask(supplierResource, resources.get(0), this.coordinateReference.get(), injured); + produceMoveTask(supplierResource, resources.get(0), injured); } else { @@ -464,7 +464,7 @@ public class BattleRootTask extends AbtParentTask { } private void produceMoveTask(ScenarioResource supplierResource, ScenarioResource fuelResource, - Coordinate coordinate, Integer injured) { + Integer injured) { ScenarioTask task = new ScenarioTask(); task.setId(IdUtils.simpleUUID()); task.setScenarioId(scenarioTask.getScenarioId()); @@ -473,8 +473,8 @@ public class BattleRootTask extends AbtParentTask { task.setFromLat(supplierResource.getLat()); task.setFromLng(supplierResource.getLng()); - task.setToLat(fuelResource.getLat()); - task.setToLng(fuelResource.getLng()); + task.setToLat(this.scenarioInfoTmp.getSdzy().getLat()); + task.setToLng(this.scenarioInfoTmp.getSdzy().getLng()); task.setStartTime(LocalDateTime.now()); task.setFromSource("general"); log.info("承担保障任务的resourceId::{}", supplierResource.getId()); @@ -483,7 +483,6 @@ public class BattleRootTask extends AbtParentTask { @Override public void doSomeThing() { //创建一个保障任务 - ScenarioTask task = new ScenarioTask(); task.setId(IdUtils.simpleUUID()); task.setScenarioId(scenarioTask.getScenarioId()); @@ -491,11 +490,11 @@ public class BattleRootTask extends AbtParentTask { task.setTaskType("3"); task.setInsureResourceId(scenarioTask.getResourceId()); task.setSupplierNum(injured); - task.setToLat(coordinate.getLat() + ""); - task.setToLng(coordinate.getLng() + ""); + task.setToLat(fuelResource.getLat()); + task.setToLng(fuelResource.getLng() + ""); task.setStartTime(LocalDateTime.now()); - task.setFromLat(fuelResource.getLat()); - task.setFromLng(fuelResource.getLng()); + task.setFromLat(scenarioInfoTmp.getSdzy().getLat()); + task.setFromLng(scenarioInfoTmp.getSdzy().getLng()); task.setFromSource("general"); SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task); SupplierTask supplierTask = new SupplierTask(task, roomId); From 2e9a0761d316040f2f3147ce2cc580ee305a4ea6 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Thu, 25 Sep 2025 16:56:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=A9=E6=B0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WeatherResourceController.java | 30 +++++++++++++++---- .../impl/WeatherResourceServiceImpl.java | 12 ++++++-- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hivekion/baseData/controller/WeatherResourceController.java b/src/main/java/com/hivekion/baseData/controller/WeatherResourceController.java index bc1ae55..779f177 100644 --- a/src/main/java/com/hivekion/baseData/controller/WeatherResourceController.java +++ b/src/main/java/com/hivekion/baseData/controller/WeatherResourceController.java @@ -1,5 +1,6 @@ package com.hivekion.baseData.controller; +import com.hivekion.baseData.domain.TblWeaponVo.TblWeaponModelVo; import com.hivekion.baseData.domain.tblvehicleVo.VehicleAddInputVo; import com.hivekion.baseData.entity.WeatherResource; import com.hivekion.baseData.service.IWeatherResourceService; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.stereotype.Controller; import javax.annotation.Resource; +import java.io.Serializable; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -37,12 +39,21 @@ public class WeatherResourceController extends BaseController{ @ApiOperation(value = "新增天气信息", notes = "") @AutoLog(value = "新增天气信息", operationType = OperationTypeEnum.INSERT, module = "基础数据/新增车辆信息") public boolean add(@RequestBody WeatherResource inputVo) throws Exception { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime begDate = LocalDateTime.parse(inputVo.getLastBegTimeStr(),dtf); - LocalDateTime endDate = LocalDateTime.parse(inputVo.getLastEndTimeStr(),dtf); - inputVo.setLastBegTime(begDate); - inputVo.setLastEndTime(endDate); - return weatherResourceService.save(inputVo); + if(inputVo.getId() == null) { + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime begDate = LocalDateTime.parse(inputVo.getLastBegTimeStr(), dtf); + LocalDateTime endDate = LocalDateTime.parse(inputVo.getLastEndTimeStr(), dtf); + inputVo.setLastBegTime(begDate); + inputVo.setLastEndTime(endDate); + return weatherResourceService.save(inputVo); + }else{ + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime begDate = LocalDateTime.parse(inputVo.getLastBegTimeStr(), dtf); + LocalDateTime endDate = LocalDateTime.parse(inputVo.getLastEndTimeStr(), dtf); + inputVo.setLastBegTime(begDate); + inputVo.setLastEndTime(endDate); + return weatherResourceService.updateById(inputVo); + } } @ApiOperation(value = "查询天气列表", notes = "") @@ -75,4 +86,11 @@ public class WeatherResourceController extends BaseController{ weatherResourceService.removeById(id); return ResponseData.success(null); } + + @GetMapping("/getInfo") + @ApiOperation(value = "获取天气详细信息", notes = "") + @AutoLog(value = "获取天气详细信息", operationType = OperationTypeEnum.SELECT, module = "天气详细信息") + public WeatherResource getInfo(@RequestParam("id") Integer id) { + return weatherResourceService.getById(id); + } } diff --git a/src/main/java/com/hivekion/baseData/service/impl/WeatherResourceServiceImpl.java b/src/main/java/com/hivekion/baseData/service/impl/WeatherResourceServiceImpl.java index 97b8a3a..83b65d4 100644 --- a/src/main/java/com/hivekion/baseData/service/impl/WeatherResourceServiceImpl.java +++ b/src/main/java/com/hivekion/baseData/service/impl/WeatherResourceServiceImpl.java @@ -22,13 +22,21 @@ public class WeatherResourceServiceImpl extends ServiceImpl list(WeatherResource ebe) { + if(ebe.getScenarioId() != null){ + return this.list(new QueryWrapper().eq("scenario_id",ebe.getScenarioId())); + }else{ + return this.list(); + } - return this.list(new QueryWrapper().eq("scenario_id",ebe.getScenarioId())); } @Override public Long count(WeatherResource ebe) { - return this.list(new QueryWrapper().eq("scenario_id",ebe.getScenarioId())).stream().count(); + if(ebe.getScenarioId() != null){ + return this.list(new QueryWrapper().eq("scenario_id",ebe.getScenarioId())).stream().count(); + }else{ + return this.list().stream().count(); + } } } From b24681426f4daf8e49f37201223c345b15d983bb Mon Sep 17 00:00:00 2001 From: wanglei <34475144@qq.com> Date: Sun, 28 Sep 2025 09:43:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 50c871e..80b6080 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,9 +1,9 @@ spring.datasource.dynamic.primary=dm spring.datasource.dynamic.strict=false -spring.datasource.dynamic.datasource.dm.url=jdbc:dm://127.0.0.1:5236/SIMULATION +spring.datasource.dynamic.datasource.dm.url=jdbc:dm://192.168.0.53:5236/SIMULATION spring.datasource.dynamic.datasource.dm.driver-class-name=dm.jdbc.driver.DmDriver spring.datasource.dynamic.datasource.dm.username=SYSDBA -spring.datasource.dynamic.datasource.dm.password=SYSDBA001 +spring.datasource.dynamic.datasource.dm.password=Admin123 spring.redis.database=0 spring.redis.host=127.0.0.1