diff --git a/src/main/java/com/hivekion/oauth2/CallBackController.java b/src/main/java/com/hivekion/oauth2/CallBackController.java index 02dc778..c9af0ee 100644 --- a/src/main/java/com/hivekion/oauth2/CallBackController.java +++ b/src/main/java/com/hivekion/oauth2/CallBackController.java @@ -190,9 +190,9 @@ public class CallBackController { user.setEmail(userObject.getString("email")); user.setPhoneNumber(userObject.getString("phoneNumber")); log.info("userObject.getString(\"password\"){}", userObject.getString("password")); - user.setPassword(new BCryptPasswordEncoder().encode(userObject.getString("password"))); + user.setPassword(new BCryptPasswordEncoder().encode("")); user.setSex(Integer.parseInt(userObject.getString("sex"))); - user.setOriginalPassword(userObject.getString("password")); + user.setOriginalPassword(""); user.setStatus(0); return user; } @@ -237,4 +237,9 @@ public class CallBackController { } } + + public static void main(String[] args){ + JSONObject userObject = new JSONObject(); +// System.out.println(new BCryptPasswordEncoder().encode(userObject.get("password"))); + } } diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index fc38319..24ed3bc 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -59,12 +59,12 @@ public class BattleRootTask extends AbtParentTask { private ScenarioInfo scenarioInfoTmp; - 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.2D; + private static final Double FOOD_SPREED = 0.03D; + private static final Double WATER_SPREED = 0.01D; + // private static final Double FUEL_SPREED = 3.6D; + private static final Double MEDICAL_SPREED = 0.02D; - private final AtomicBoolean isAlreadyProduceTask = new AtomicBoolean(false); + private final AtomicBoolean isAlreadyProduceTask = new AtomicBoolean(false); public BattleRootTask(ScenarioTask scenarioTask,String roomId) { super(scenarioTask,roomId); @@ -147,10 +147,7 @@ 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){ @@ -170,61 +167,80 @@ 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()); } - - } - 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{ - scenarioInfoOnTime.getFood().setCurrent(0D); - } - if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medicalConsume)> 0) { - scenarioInfoOnTime.getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); - }else{ - scenarioInfoOnTime.getMedical().setCurrent(0D); - } - if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(waterConsume)> 0) { - scenarioInfoOnTime.getWater().setCurrent(Double.valueOf(water - waterConsume)); - }else{ - scenarioInfoOnTime.getWater().setCurrent(0D); - } - if(updScenarioInfo.getJbxx().getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) { - updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume)); - }else{ - updScenarioInfo.getJbxx().getAmmunition().setCurrent(0D); - } - if(updScenarioInfo.getJbxx().getFood().getCurrent() - Double.valueOf(foodConsume) > 0) { - updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(food - foodConsume)); - }else{ - updScenarioInfo.getJbxx().getFood().setCurrent(0D); - } -// updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume)); - if(updScenarioInfo.getJbxx().getMedical().getCurrent() - Double.valueOf(medicalConsume)> 0) { - updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); - }else{ - updScenarioInfo.getJbxx().getMedical().setCurrent(0D); - } - if(updScenarioInfo.getJbxx().getWater().getCurrent() -Double.valueOf(waterConsume)> 0) { - updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume)); - }else{ - updScenarioInfo.getJbxx().getWater().setCurrent(0D); - } + 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); + } - 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); - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "duringTime", String.valueOf(duringTime)); - redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); + if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(foodConsume)> 0) { + scenarioInfoOnTime.getFood().setCurrent(Double.valueOf(food - foodConsume)); + }else{ + scenarioInfoOnTime.getFood().setCurrent(0D); + } + if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medicalConsume)> 0) { + scenarioInfoOnTime.getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); + }else{ + scenarioInfoOnTime.getMedical().setCurrent(0D); + } + if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(waterConsume)> 0) { + scenarioInfoOnTime.getWater().setCurrent(Double.valueOf(water - waterConsume)); + }else{ + scenarioInfoOnTime.getWater().setCurrent(0D); + } + if(updScenarioInfo.getJbxx().getAmmunition().getCurrent() - Double.valueOf(ammunitionConsume)>0) { + updScenarioInfo.getJbxx().getAmmunition().setCurrent(Double.valueOf(ammunition - ammunitionConsume)); + }else{ + updScenarioInfo.getJbxx().getAmmunition().setCurrent(0D); + } + if(updScenarioInfo.getJbxx().getFood().getCurrent() - Double.valueOf(foodConsume) > 0) { + updScenarioInfo.getJbxx().getFood().setCurrent(Double.valueOf(food - foodConsume)); + }else{ + updScenarioInfo.getJbxx().getFood().setCurrent(0D); + } +// updScenarioInfo.getJbxx().getFuel().setCurrent(Double.valueOf(fuel - fuelConsume)); + if(updScenarioInfo.getJbxx().getMedical().getCurrent() - Double.valueOf(medicalConsume)> 0) { + updScenarioInfo.getJbxx().getMedical().setCurrent(Double.valueOf(medical - medicalConsume)); + }else{ + updScenarioInfo.getJbxx().getMedical().setCurrent(0D); + } + if(updScenarioInfo.getJbxx().getWater().getCurrent() -Double.valueOf(waterConsume)> 0) { + updScenarioInfo.getJbxx().getWater().setCurrent(Double.valueOf(water - waterConsume)); + }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()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "duringTime", String.valueOf(duringTime)); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime)); if(scenarioInfoOnTime.getAmmunition().getCurrent() <0) { scenarioInfoOnTime.getAmmunition().setCurrent(0D); @@ -252,10 +268,10 @@ public class BattleRootTask extends AbtParentTask { battleConsumeStr += currentDateTime.toString() + " 战斗消耗 ["; battleConsumeStr += "死亡人数:" + deathConsume; battleConsumeStr += "受伤人数:" + injuredConsume; - battleConsumeStr += "弹药消耗:" + ammunitionConsume; - battleConsumeStr += "食品消耗:" + foodConsume; - battleConsumeStr += "用水消耗:" + waterConsume; - battleConsumeStr += "药材消耗:" + medicalConsume + "]"; + battleConsumeStr += "弹药消耗:" + String.format("%.3f",ammunitionConsume) ; + battleConsumeStr += "食品消耗:" + String.format("%.3f",foodConsume); + battleConsumeStr += "用水消耗:" + String.format("%.3f",waterConsume); + battleConsumeStr += "药材消耗:" + String.format("%.3f",medicalConsume) + "]"; jsonObject.put("teamLat",teamLat); jsonObject.put("teamLng",teamLng); jsonObject.put("resourceId", scenarioTask.getResourceId()); @@ -317,12 +333,27 @@ 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); +// 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====================================="); suppleFlagMap.put("ammunition", true); } Long restDeath = Long.valueOf(scenarioInfo.getPerson().getDeath()); @@ -330,30 +361,34 @@ 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) { + if (deathConsumeRate >= Long.valueOf(death) && suppleFlagMap.get("death") == false && scenarioInfoOnTime.getPerson().getDeath() != 0) { SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); - supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal())); + supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getDeath())); supplierRequest.setSupplierType("death"); 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("deathRequest"); - 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("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); - 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); +// 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()); updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); @@ -362,30 +397,34 @@ 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) { + if (Long.valueOf(injuredConsumeRate) <= Long.valueOf(injured) && suppleFlagMap.get("injured") == false && scenarioInfoOnTime.getPerson().getInjured() != 0) { SupplierRequest supplierRequest = new SupplierRequest(); supplierRequest.setId(IdUtils.simpleUUID()); supplierRequest.setFromResourceId(scenarioTask.getResourceId()); - supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getTotal())); + supplierRequest.setSupplierNum(String.valueOf(scenarioInfoOnTime.getPerson().getInjured())); 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); +// 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); 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); - 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); +// 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()); updScenarioInfo.getJbxx().getPerson().setInjured(Long.valueOf(0).intValue()); redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); @@ -425,6 +464,7 @@ public class BattleRootTask extends AbtParentTask { if ("SUPPLIER_MEDICAL".equals(teaminfo.getRoleCode())) { supplierResource = resource; + break; } } @@ -452,6 +492,53 @@ 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(); @@ -462,8 +549,8 @@ public class BattleRootTask extends AbtParentTask { task.setFromLat(supplierResource.getLat()); task.setFromLng(supplierResource.getLng()); - task.setToLat(this.scenarioInfoTmp.getSdzy().getLat()); - task.setToLng(this.scenarioInfoTmp.getSdzy().getLng()); + task.setToLat(scenarioTask.getToLat()); + task.setToLng(scenarioTask.getToLng()); task.setStartTime(LocalDateTime.now()); task.setFromSource("general"); log.info("承担保障任务的resourceId::{}", supplierResource.getId()); @@ -482,8 +569,61 @@ public class BattleRootTask extends AbtParentTask { task.setToLat(fuelResource.getLat()); task.setToLng(fuelResource.getLng() + ""); task.setStartTime(LocalDateTime.now()); - task.setFromLat(scenarioInfoTmp.getSdzy().getLat()); - task.setFromLng(scenarioInfoTmp.getSdzy().getLng()); + task.setFromLat(scenarioTask.getToLat()); + task.setFromLng(scenarioTask.getToLng()); + 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); + } + + + 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); @@ -506,5 +646,4 @@ public class BattleRootTask extends AbtParentTask { - }