diff --git a/src/main/java/com/hivekion/common/config/WsEndpointConfig.java b/src/main/java/com/hivekion/common/config/WsEndpointConfig.java index f64b097..35eb647 100644 --- a/src/main/java/com/hivekion/common/config/WsEndpointConfig.java +++ b/src/main/java/com/hivekion/common/config/WsEndpointConfig.java @@ -2,6 +2,7 @@ package com.hivekion.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.web.socket.server.standard.ServerEndpointExporter; /** @@ -14,6 +15,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * @since 2025/7/22 */ @Configuration + public class WsEndpointConfig { @Bean public ServerEndpointExporter serverEndpointExporter() { diff --git a/src/main/java/com/hivekion/room/RoomManager.java b/src/main/java/com/hivekion/room/RoomManager.java index c2beaa6..b616a3d 100644 --- a/src/main/java/com/hivekion/room/RoomManager.java +++ b/src/main/java/com/hivekion/room/RoomManager.java @@ -23,10 +23,10 @@ public class RoomManager { private static final Map roomsMap = new ConcurrentHashMap<>(); - public static void startRoom(String id, Scenario scenario, long time) { + public static void startRoom(String id, Scenario scenario, long duringTime) { Room room = new Room(id, scenario); roomsMap.put(id, room); - room.start(time); + room.start(duringTime); } public static void stopRoom(String id) { diff --git a/src/main/java/com/hivekion/room/bean/AbtParentTask.java b/src/main/java/com/hivekion/room/bean/AbtParentTask.java index 49b1b54..c55ebbf 100644 --- a/src/main/java/com/hivekion/room/bean/AbtParentTask.java +++ b/src/main/java/com/hivekion/room/bean/AbtParentTask.java @@ -90,7 +90,6 @@ public abstract class AbtParentTask implements TaskAction { private StatisticBean statisticBean; - public AbtParentTask(ScenarioTask scenarioTask, String roomId) { this.scenarioTask = scenarioTask; this.roomId = roomId; @@ -250,11 +249,16 @@ public abstract class AbtParentTask implements TaskAction { schedule.scheduleWithFixedDelay(() -> { try { + Room room = RoomManager.getRoom(this.roomId); + if (room == null || room.isTimeExpired()) { + log.error("房间不存在或者已经到达想定结束时间"); + return; + } if (this.getRoomStatus()) { //自动生成的任务不需要判断油量；不要在生成新的任务 - log.info("{}-fromSource::{}",scenarioTask.getResourceId(),scenarioTask.getFromSource()); - if(!"general".equals(scenarioTask.getFromSource())) { + log.info("{}-fromSource::{}", scenarioTask.getResourceId(), scenarioTask.getFromSource()); + if (!"general".equals(scenarioTask.getFromSource())) { double currentFuel = getCurrentFuel(); double totalFuel = statisticBean.getFuel().getTotal(); log.info("totalFuel::{}", totalFuel); @@ -282,7 +286,6 @@ public abstract class AbtParentTask implements TaskAction { } } - if (distanceInfoMap.isEmpty()) { return; } @@ -290,7 +293,7 @@ public abstract class AbtParentTask implements TaskAction { if (duringAction != null) { duringAction.doSomeThing(); } - log.info("移动中..... 放大系数{}",RoomManager.getMag(roomId)); + log.info("移动中..... 放大系数{}", RoomManager.getMag(roomId)); //跑动距离 double distance = duringTime.getAndAdd(RoomManager.getMag(roomId)) * speed; @@ -348,7 +351,7 @@ public abstract class AbtParentTask implements TaskAction { this.scenarioTask.getResourceId()); editScenarioInfo.getJbxx().getTeam().setLat(coordinate.getLat() + ""); editScenarioInfo.getJbxx().getTeam().setLng(coordinate.getLng() + ""); - setEditScenarioInfo(editScenarioInfo,scenarioTask.getResourceId()); + setEditScenarioInfo(editScenarioInfo, scenarioTask.getResourceId()); pushStatus(scenarioTask.getResourceId()); } else if (Double.compare(distance, endPoint.getKey()) == 0) { @@ -399,7 +402,7 @@ public abstract class AbtParentTask implements TaskAction { return JSON.parseObject(updJsonStr, EditScenarioInfo.class); } - protected void setEditScenarioInfo(EditScenarioInfo editScenarioInfo,String resourceId) { + protected void setEditScenarioInfo(EditScenarioInfo editScenarioInfo, String resourceId) { SpringUtil.getBean(RedisUtil.class).hset( this.scenarioTask.getScenarioId() + "-" + roomId + "-" + resourceId, "updScenarioInfo", JSON.toJSONString(editScenarioInfo)); @@ -473,7 +476,6 @@ public abstract class AbtParentTask implements TaskAction { // 找出油料保障分队 for (ScenarioResource resource : resourceList) { - Teaminfo teaminfo = teamInfoMap.get(resource.getResourceId()); if ("SUPPLIER_FUEL".equals(teaminfo.getRoleCode())) { diff --git a/src/main/java/com/hivekion/room/bean/Room.java b/src/main/java/com/hivekion/room/bean/Room.java index 026f77c..dc252eb 100644 --- a/src/main/java/com/hivekion/room/bean/Room.java +++ b/src/main/java/com/hivekion/room/bean/Room.java @@ -51,7 +51,7 @@ public class Room implements AutoCloseable { private Map resourceCoordinateMap = new ConcurrentHashMap<>(); //资源路线path private Map resourcePathMap = new ConcurrentHashMap<>(); - private Map scenarioResourceMap = new ConcurrentHashMap<>(); + private Map scenarioResourceMap = new ConcurrentHashMap<>(); /** * 任务管理相关 */ @@ -70,7 +70,7 @@ public class Room implements AutoCloseable { private com.hivekion.statistic.service.ScenarioService scenarioService; - private AtomicInteger numStatus = new AtomicInteger(0); + private AtomicInteger numStatus = new AtomicInteger(0); /** * 任务容器 */ @@ -109,11 +109,14 @@ public class Room implements AutoCloseable { */ public void start(long time) { status.set(true); + log.info("想定持续时间{}", time); totalTime.set(time); - startTask(); //初始化系统资源 物资人员等信息 initRoomParam(); pushRoomInfo(); + + startTask(); + numStatus.set(1); } @@ -139,7 +142,6 @@ public class Room implements AutoCloseable { } - /** * 暂停 */ @@ -159,7 +161,10 @@ public class Room implements AutoCloseable { public long getDuringTime() { return duringTime.get(); } - + //是否到达想定结束时间 + public boolean isTimeExpired() { + return totalTime.get() - duringTime.get() <= 0; + } // 启动定时任务 private void startTask() { @@ -172,14 +177,24 @@ public class Room implements AutoCloseable { } long curTime = duringTime.addAndGet(this.mag); - - sendRemainTime((totalTime.get() - curTime)); + if (totalTime.get() - curTime > 0) { + sendRemainTime((totalTime.get() - curTime)); + } else { + log.info("想定结束,持续时间{}", curTime); + future.cancel(true); + scheduler.shutdownNow(); + } NavigableMap> actions = actionMap.headMap(curTime, true); if (!actions.isEmpty()) { actions.forEach((key, action) -> { action.forEach((taskAction, task) -> { - actionExecutor.submit(task::doSomeThing); + try { + actionExecutor.submit(task::doSomeThing); + } catch (Exception e) { + log.error("error::", e); + } + }); }); @@ -204,7 +219,7 @@ public class Room implements AutoCloseable { } @Override - public void close() throws Exception { + public void close() { actionMap.clear(); if (future != null && !future.isCancelled()) { future.cancel(true); @@ -215,7 +230,7 @@ public class Room implements AutoCloseable { } private void sendRemainTime(long remainTime) { - + log.info("remain_time{}", remainTime); Map timeMap = new HashMap<>(); timeMap.put("update_time_str", utils.formatSeconds(remainTime)); timeMap.put("remain_time", remainTime); @@ -262,33 +277,25 @@ public class Room implements AutoCloseable { scenario.getResourceList().forEach(resource -> { scenarioResourceMap.put(resource.getId(), resource); }); - long endTime = System.currentTimeMillis(); - log.info("======cost time============={}===================",endTime-begTime); + long endTime = System.currentTimeMillis(); + log.info("======cost time============={}===================", endTime - begTime); } public void addResourcePath(String resourceId, Object obj) { resourcePathMap.put(resourceId, obj); } - public Object getResourcePath(String resourceId) { - return resourcePathMap.get(resourceId); - } - public void addResourceLastPosition(String resourceId, Coordinate obj) { - resourceCoordinateMap.put(resourceId, obj); - } - - public Coordinate getResourceLastPosition(String resourceId) { - return resourceCoordinateMap.get(resourceId); - } public Map getPathMap() { return resourcePathMap; } + public Map getScenarioResourceMap() { return scenarioResourceMap; } - private void pushRoomInfo(){ + + private void pushRoomInfo() { ResponseCmdInfo respObj = new ResponseCmdInfo<>(); Map dataMap = new HashMap<>(); dataMap.put("mag", this.getMag()); @@ -300,24 +307,25 @@ public class Room implements AutoCloseable { Global.sendCmdInfoQueue.add(respObj); } - private void clearScenarioCache(){ + private void clearScenarioCache() { try { scenario.setResourceList(SpringUtil.getBean(ScenarioResourceServiceImpl.class) - .getResourceListByScenarioId(scenario.getId())); + .getResourceListByScenarioId(scenario.getId())); if (redisUtil == null) { redisUtil = SpringUtil.getBean(RedisUtil.class); } for (ScenarioResource scenarioResource : this.scenario.getResourceList()) { - ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(), - roomId, scenarioResource.getId()); + ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo( + scenarioResource.getScenarioId(), + roomId, scenarioResource.getId()); EditScenarioInfo updScenarioInfo = scenarioService.listEditScenarioInfo( - scenarioResource.getScenarioId(), roomId, scenarioResource.getId()); + scenarioResource.getScenarioId(), roomId, scenarioResource.getId()); redisUtil.delete( - scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId()); + scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId()); redisUtil.delete( - scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId()); + scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId()); } - }catch (Exception ex){ + } catch (Exception ex) { log.error("===================clear cached fail=========================="); } } diff --git a/src/main/java/com/hivekion/scenario/controller/ScenarioRoomController.java b/src/main/java/com/hivekion/scenario/controller/ScenarioRoomController.java index ac89768..a51421c 100644 --- a/src/main/java/com/hivekion/scenario/controller/ScenarioRoomController.java +++ b/src/main/java/com/hivekion/scenario/controller/ScenarioRoomController.java @@ -164,7 +164,7 @@ public class ScenarioRoomController extends BaseController { ResponseCmdInfo respObj = new ResponseCmdInfo<>(); Map dataMap = new HashMap<>(); dataMap.put("mag", mag); - dataMap.put("status", RoomManager.getRoom(room.getId()).getStatus()); + dataMap.put("status", RoomManager.getRoom(room.getId())==null?0:RoomManager.getRoom(room.getId()).getStatus()); respObj.setData(dataMap); respObj.setRoom(room.getId()); respObj.setScenarioId(room.getScenarioId()); diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 642de63..ad78788 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,12 +1,12 @@ spring.datasource.dynamic.primary=dm spring.datasource.dynamic.strict=false -spring.datasource.dynamic.datasource.dm.url=jdbc:dm://192.168.0.53:5236/SIMULATION +spring.datasource.dynamic.datasource.dm.url=jdbc:dm://127.0.0.1:5236/SIMULATION spring.datasource.dynamic.datasource.dm.driver-class-name=dm.jdbc.driver.DmDriver -spring.datasource.dynamic.datasource.dm.username=simulation -spring.datasource.dynamic.datasource.dm.password=Simulation001 +spring.datasource.dynamic.datasource.dm.username=SYSDBA +spring.datasource.dynamic.datasource.dm.password=SYSDBA001 spring.redis.database=0 -spring.redis.host=192.168.0.225 +spring.redis.host=127.0.0.1 spring.redis.port=6379 #spring.redis.password=123 spring.redis.timeout=5000 @@ -52,4 +52,3 @@ get.all.user = http://127.0.0.1/oauth2Server/api/outside/syncUserAll logout.url=http://127.0.0.1:99/oauth2Server/oauth2/logout path.planning.url=http://192.168.0.53:8989/route - diff --git a/src/main/resources/application-rule.properties b/src/main/resources/application-rule.properties index 9e3c6dd..e7387b5 100644 --- a/src/main/resources/application-rule.properties +++ b/src/main/resources/application-rule.properties @@ -3,7 +3,7 @@ death.warn = 2 ammunition.warn = 3 food.warn = 3 water.warn = 3 -fuel.warn = 95.99 +fuel.warn = 99.80 medical.warn = 1 death.spreed = 3 injured.spreed = 3 diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..b9c02a1 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,30 @@ + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + /home/admin/app/logs/app.log + + + logs/app-%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/hivekion/ApplicationTest.java b/src/test/java/com/hivekion/ApplicationTest.java index 1760d2d..23e2714 100644 --- a/src/test/java/com/hivekion/ApplicationTest.java +++ b/src/test/java/com/hivekion/ApplicationTest.java @@ -2,6 +2,13 @@ package com.hivekion; import com.hivekion.baseData.entity.ModuleStatus; import com.hivekion.baseData.service.ModuleStatusService; +import com.hivekion.common.uuid.IdUtils; +import com.hivekion.scenario.entity.ScenarioResource; +import com.hivekion.scenario.service.ScenarioResourceService; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.List; import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -21,20 +28,26 @@ import org.springframework.test.context.junit4.SpringRunner; */ @SpringBootTest(classes = DemoApplication.class) @AutoConfigureMockMvc + @Slf4j @RunWith(SpringRunner.class) public class ApplicationTest { + @Resource private ModuleStatusService moduleStatusService; - @Test - public void modStatus(){ - ModuleStatus status = new ModuleStatus(); - status.setModuleName("评估子系统"); - status.setModuleUrl("/"); - status.setSortOrder(5); - status.setModuleStatus("0"); - status.setModuleCode("evaluation_system"); - moduleStatusService.save(status); - } + @Resource + private ScenarioResourceService scenarioResourceService; + + @Test + public void modStatus() { + ModuleStatus status = new ModuleStatus(); + status.setModuleName("评估子系统"); + status.setModuleUrl("/"); + status.setSortOrder(5); + status.setModuleStatus("0"); + status.setModuleCode("evaluation_system"); + moduleStatusService.save(status); + } + }