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(); + } } } 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; + } +} diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index 9427021..fc38319 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -59,10 +59,10 @@ public class BattleRootTask extends AbtParentTask { private ScenarioInfo scenarioInfoTmp; - private static final Double FOOD_SPREED = 0.03D; - private static final Double WATER_SPREED = 0.01D; + private static final Double FOOD_SPREED = 0.3D; + private static final Double WATER_SPREED = 0.1D; // private static final Double FUEL_SPREED = 3.6D; - private static final Double MEDICAL_SPREED = 0.02D; + private static final Double MEDICAL_SPREED = 0.2D; private final AtomicBoolean isAlreadyProduceTask = new AtomicBoolean(false); @@ -147,7 +147,10 @@ public class BattleRootTask extends AbtParentTask { } while(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() < 0); - + ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble()); + foodConsume = FOOD_SPREED; + waterConsume = WATER_SPREED; + medicalConsume = MEDICAL_SPREED; scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(death + deathConsume).intValue()); scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(injured + injuredConsume).intValue()); if(scenarioInfoOnTime.getPerson().getCurrent() - Long.valueOf(deathConsume).intValue()-Long.valueOf(injuredConsume).intValue() <=0){ @@ -167,17 +170,14 @@ public class BattleRootTask extends AbtParentTask { scenarioInfoOnTime.getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath()); updScenarioInfo.getJbxx().getPerson().setInjured(scenarioInfoOnTime.getPerson().getTotal() - scenarioInfoOnTime.getPerson().getInjured()-scenarioInfoOnTime.getPerson().getDeath()); } + + } - ammunitionConsume = intervalDuringTime/2 * (RandomUtil.getSecureRandom().nextDouble()*0.1); - foodConsume = intervalDuringTime/2 *FOOD_SPREED; - waterConsume = intervalDuringTime/2 *WATER_SPREED; - medicalConsume = intervalDuringTime/2 *MEDICAL_SPREED; if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) { scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume)); }else{ scenarioInfoOnTime.getAmmunition().setCurrent(0D); } - if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(foodConsume)> 0) { scenarioInfoOnTime.getFood().setCurrent(Double.valueOf(food - foodConsume)); }else{ @@ -214,31 +214,15 @@ public class BattleRootTask extends AbtParentTask { }else{ updScenarioInfo.getJbxx().getWater().setCurrent(0D); } - if(SpringUtil.getBean(RedisUtil.class).hasKey(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), - "updScenarioInfo-ammunition")) { - String supplierAmmunition = (String) SpringUtil.getBean(RedisUtil.class).hget( - scenarioTask.getScenarioId() + "-" + roomId + "-" - + scenarioTask.getResourceId(), - "updScenarioInfo-ammunition"); - if (Double.valueOf(supplierAmmunition) > 0D) { - scenarioInfoOnTime.getAmmunition().setCurrent(Double.valueOf(supplierAmmunition)); - updScenarioInfo.getJbxx().getAmmunition() - .setCurrent(Double.valueOf(supplierAmmunition)); - SpringUtil.getBean(RedisUtil.class).hset( - scenarioTask.getScenarioId() + "-" + roomId + "-" - + scenarioTask.getResourceId(), - "updScenarioInfo-ammunition", "0"); - } - } + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); -// ResponseCmdInfo respObj = new ResponseCmdInfo<>(); -// respObj.setData(JSON.toJSONString(updScenarioInfo)); -// respObj.setRoom(roomId); -// respObj.setScenarioId(scenarioTask.getScenarioId()); -// respObj.setCmdType("updScenarioInfo"); -// Global.sendCmdInfoQueue.add(respObj); - pushStatus(scenarioTask.getResourceId()); + ResponseCmdInfo respObj = new ResponseCmdInfo<>(); + respObj.setData(JSON.toJSONString(updScenarioInfo)); + respObj.setRoom(roomId); + respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("updScenarioInfo"); + Global.sendCmdInfoQueue.add(respObj); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "duringTime", String.valueOf(duringTime)); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); @@ -268,10 +252,10 @@ public class BattleRootTask extends AbtParentTask { battleConsumeStr += currentDateTime.toString() + " 战斗消耗 ["; battleConsumeStr += "死亡人数:" + deathConsume; battleConsumeStr += "受伤人数:" + injuredConsume; - battleConsumeStr += "弹药消耗:" + String.format("%.3f",ammunitionConsume) ; - battleConsumeStr += "食品消耗:" + String.format("%.3f",foodConsume); - battleConsumeStr += "用水消耗:" + String.format("%.3f",waterConsume); - battleConsumeStr += "药材消耗:" + String.format("%.3f",medicalConsume) + "]"; + battleConsumeStr += "弹药消耗:" + ammunitionConsume; + battleConsumeStr += "食品消耗:" + foodConsume; + battleConsumeStr += "用水消耗:" + waterConsume; + battleConsumeStr += "药材消耗:" + medicalConsume + "]"; jsonObject.put("teamLat",teamLat); jsonObject.put("teamLng",teamLng); jsonObject.put("resourceId", scenarioTask.getResourceId()); @@ -333,27 +317,12 @@ public class BattleRootTask extends AbtParentTask { supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLng(jsonObject.get("teamLng").toString()); supplierRequestService.save(supplierRequest); -// ResponseCmdInfo respObj = new ResponseCmdInfo<>(); -// respObj.setData(JSON.toJSONString(supplierRequest)); -// respObj.setRoom(roomId); -// respObj.setScenarioId(scenarioTask.getScenarioId()); -// respObj.setCmdType("ammunitionRequest"); -// Global.sendCmdInfoQueue.add(respObj); - scenarioInfoOnTime.getSupplierRequests().add(supplierRequest); - updScenarioInfo.getSupplierRequests().add(supplierRequest); - log.info("================================begin ammunition Supplier Task====================================="); - produceTask(scenarioInfoOnTime.getAmmunition().getTotal()); -// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); -// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); - - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); -// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); -// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); -// updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getDeath()); -// updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue()); - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), - "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); - log.info("================================end ammunition Supplier Task====================================="); + ResponseCmdInfo respObj = new ResponseCmdInfo<>(); + respObj.setData(JSON.toJSONString(supplierRequest)); + respObj.setRoom(roomId); + respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("ammunitionRequest"); + Global.sendCmdInfoQueue.add(respObj); suppleFlagMap.put("ammunition", true); } Long restDeath = Long.valueOf(scenarioInfo.getPerson().getDeath()); @@ -361,34 +330,30 @@ public class BattleRootTask extends AbtParentTask { if (scenarioInfo.getPerson().getTotal() != 0) { deathConsumeRate = restDeath * 100 / scenarioInfoOnTime.getPerson().getTotal(); } - if (deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false && scenarioInfoOnTime.getPerson().getDeath() != 0) { + if (deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false) { SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); - supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getDeath())); + supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal())); supplierRequest.setSupplierType("death"); supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLng(jsonObject.get("teamLng").toString()); supplierRequestService.save(supplierRequest); - scenarioInfoOnTime.getSupplierRequests().add(supplierRequest); - updScenarioInfo.getSupplierRequests().add(supplierRequest); -// ResponseCmdInfo respObj = new ResponseCmdInfo<>(); -// respObj.setData(JSON.toJSONString(supplierRequest)); -// respObj.setRoom(roomId); -// respObj.setScenarioId(scenarioTask.getScenarioId()); -// respObj.setCmdType("deathRequest"); -// Global.sendCmdInfoQueue.add(respObj); + ResponseCmdInfo respObj = new ResponseCmdInfo<>(); + respObj.setData(JSON.toJSONString(supplierRequest)); + respObj.setRoom(roomId); + respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("deathRequest"); + Global.sendCmdInfoQueue.add(respObj); log.info("================================begin death Supplier Task====================================="); produceTask(scenarioInfoOnTime.getPerson().getDeath()); -// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); -// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); - scenarioInfoOnTime.getPerson().setTotal(scenarioInfoOnTime.getPerson().getTotal()-scenarioInfoOnTime.getPerson().getDeath()); - scenarioInfoOnTime.getPerson().setDeath(Long.valueOf(0).intValue()); - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); -// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); -// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); - updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getDeath()); + String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); + ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); + scenarioInfoInjured.getPerson().setDeath(Long.valueOf(0).intValue()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured)); + updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); + updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); @@ -397,34 +362,30 @@ public class BattleRootTask extends AbtParentTask { } Long restInjured = Long.valueOf(scenarioInfoOnTime.getPerson().getInjured()); Long injuredConsumeRate = restInjured * 100 / scenarioInfoOnTime.getPerson().getTotal(); - if (Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false && scenarioInfoOnTime.getPerson().getInjured() != 0) { + if (Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false) { SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); - supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getInjured())); + supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal())); supplierRequest.setSupplierType("injured"); supplierRequest.setGeneralTime(currentDateTime); supplierRequest.setLat(jsonObject.get("teamLat").toString()); supplierRequest.setLng(jsonObject.get("teamLng").toString()); supplierRequestService.save(supplierRequest); -// ResponseCmdInfo respObj = new ResponseCmdInfo<>(); -// respObj.setData(JSON.toJSONString(supplierRequest)); -// respObj.setRoom(roomId); -// respObj.setScenarioId(scenarioTask.getScenarioId()); -// respObj.setCmdType("injuredRequest"); -// Global.sendCmdInfoQueue.add(respObj); - scenarioInfoOnTime.getSupplierRequests().add(supplierRequest); - updScenarioInfo.getSupplierRequests().add(supplierRequest); + ResponseCmdInfo respObj = new ResponseCmdInfo<>(); + respObj.setData(JSON.toJSONString(supplierRequest)); + respObj.setRoom(roomId); + respObj.setScenarioId(scenarioTask.getScenarioId()); + respObj.setCmdType("injuredRequest"); + Global.sendCmdInfoQueue.add(respObj); log.info("================================begin injured Supplier Task====================================="); produceTask(scenarioInfoOnTime.getPerson().getInjured()); -// String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); -// ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); - scenarioInfoOnTime.getPerson().setTotal(scenarioInfoOnTime.getPerson().getTotal()-scenarioInfoOnTime.getPerson().getInjured()); - scenarioInfoOnTime.getPerson().setInjured(Long.valueOf(0).intValue()); - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); -// updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); -// updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); - updScenarioInfo.getJbxx().getPerson().setTotal(updScenarioInfo.getJbxx().getPerson().getTotal()-updScenarioInfo.getJbxx().getPerson().getInjured()); + String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); + ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); + scenarioInfoInjured.getPerson().setInjured(Long.valueOf(0).intValue()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured)); + updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); + updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(0).intValue()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); @@ -464,7 +425,6 @@ public class BattleRootTask extends AbtParentTask { if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) { supplierResource = resource; - break; } } @@ -492,53 +452,6 @@ public class BattleRootTask extends AbtParentTask { } - private void produceTask(Double ammunition) { - try { - Map teamInfoMap = SpringUtil.getBean(TeaminfoServiceImpl.class) - .teamInfoMap(); - - log.info("{}-产生自动保障任务", this.scenarioTask.getResourceId()); - List resourceList = SpringUtil.getBean(BattleSupplierServiceImpl.class) - .selectSupplierResource(scenarioTask.getResourceId()); - log.info("{}-可选保障分队长度{}", scenarioTask.getResourceId(), resourceList.size()); - if (!resourceList.isEmpty()) { - ScenarioResource supplierResource = null; - // 找出油料保障分队 - for (ScenarioResource resource : resourceList) { - - - Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId()); - - if ("SUPPLIER_AMMUNITION".equals(teaminfo.getRoleCode())) { - supplierResource = resource; - - break; - } - } - if (supplierResource == null) { - log.error("找不到对应的弹药保障分队"); - return; - } - //找出医院 - List resources = SpringUtil.getBean(ScenarioResourceServiceImpl.class) - .selectResourceByRoleCode(scenarioTask.getScenarioId(), "AMMUNITION_WARE"); - if (resources.isEmpty()) { - log.error("找不到弹药仓库"); - return; - } - - produceMoveTaskAmmunition(supplierResource, resources.get(0), ammunition); - - - } else { - log.error("{}-没有保障分队可以选择", scenarioTask.getResourceId()); - } - } catch (Exception e) { - log.error("produceTask exception", e); - } - - } - private void produceMoveTask(ScenarioResource supplierResource, ScenarioResource fuelResource, Integer injured) { ScenarioTask task = new ScenarioTask(); @@ -549,8 +462,8 @@ public class BattleRootTask extends AbtParentTask { task.setFromLat(supplierResource.getLat()); task.setFromLng(supplierResource.getLng()); - task.setToLat(scenarioTask.getToLat()); - task.setToLng(scenarioTask.getToLng()); + task.setToLat(this.scenarioInfoTmp.getSdzy().getLat()); + task.setToLng(this.scenarioInfoTmp.getSdzy().getLng()); task.setStartTime(LocalDateTime.now()); task.setFromSource("general"); log.info("承担保障任务的resourceId::{}", supplierResource.getId()); @@ -569,8 +482,8 @@ public class BattleRootTask extends AbtParentTask { task.setToLat(fuelResource.getLat()); task.setToLng(fuelResource.getLng() + ""); task.setStartTime(LocalDateTime.now()); - task.setFromLat(scenarioTask.getToLat()); - task.setFromLng(scenarioTask.getToLng()); + 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); @@ -592,58 +505,6 @@ public class BattleRootTask extends AbtParentTask { } - private void produceMoveTaskAmmunition(ScenarioResource supplierResource, ScenarioResource fuelResource, - Double ammunition) { - ScenarioTask task = new ScenarioTask(); - task.setId(IdUtils.simpleUUID()); - task.setScenarioId(scenarioTask.getScenarioId()); - task.setResourceId(supplierResource.getId()); - task.setTaskType("1"); - - task.setFromLat(supplierResource.getLat()); - task.setFromLng(supplierResource.getLng()); - task.setToLat(fuelResource.getLat()); - task.setToLng(fuelResource.getLng() + ""); - task.setStartTime(LocalDateTime.now()); - task.setFromSource("general"); - log.info("承担保障任务的resourceId::{}", supplierResource.getId()); - SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task); - MoveTask moveTask = new MoveTask(task, this.roomId, new TaskAction() { - @Override - public void doSomeThing() { - //创建一个保障任务 - ScenarioTask task = new ScenarioTask(); - task.setId(IdUtils.simpleUUID()); - task.setScenarioId(scenarioTask.getScenarioId()); - task.setResourceId(supplierResource.getId()); - task.setTaskType("4"); - task.setInsureResourceId(scenarioTask.getResourceId()); - task.setSupplierNum(ammunition); - task.setToLat(scenarioTask.getToLat()); - task.setToLng(scenarioTask.getToLng()); - task.setStartTime(LocalDateTime.now()); - task.setFromLat(fuelResource.getLat()); - task.setFromLng(fuelResource.getLng() + ""); - task.setFromSource("general"); - SpringUtil.getBean(ScenarioTaskServiceImpl.class).save(task); - SupplierTask supplierTask = new SupplierTask(task, roomId); - RoomManager.addAction(roomId, 0, supplierTask); - } - - @Override - public String getId() { - return ""; - } - - @Override - public String getType() { - return ""; - } - }); - //立即执行 - RoomManager.addAction(roomId, 0, moveTask); - } - } 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