diff --git a/src/main/java/com/hivekion/Init.java b/src/main/java/com/hivekion/startup/Init.java similarity index 85% rename from src/main/java/com/hivekion/Init.java rename to src/main/java/com/hivekion/startup/Init.java index 49ff586..cbb02ab 100644 --- a/src/main/java/com/hivekion/Init.java +++ b/src/main/java/com/hivekion/startup/Init.java @@ -1,4 +1,4 @@ -package com.hivekion; +package com.hivekion.startup; import com.hivekion.thread.HandleReceiveThread; import com.hivekion.thread.HandleSendThread; @@ -20,8 +20,8 @@ import org.springframework.stereotype.Component; public class Init { @PostConstruct - public void init() { - + public void appInit() { + log.info("Init start"); new Thread(new HandleSendThread()).start(); new Thread(new HandleReceiveThread()).start(); } diff --git a/src/main/java/com/hivekion/ws/WsServer.java b/src/main/java/com/hivekion/ws/WsServer.java index 302d607..77720c0 100644 --- a/src/main/java/com/hivekion/ws/WsServer.java +++ b/src/main/java/com/hivekion/ws/WsServer.java @@ -60,13 +60,7 @@ public class WsServer { } - try{ - session.getBasicRemote().sendText(testWeatherJson("start_rain")); - Thread.sleep(10000); - session.getBasicRemote().sendText(testWeatherJson("start_snow")); - }catch (Exception e){ - log.error("error::",e); - } + } } @@ -120,27 +114,21 @@ public class WsServer { Object lock = lockMap.computeIfAbsent(scenarioId, k -> new Object()); synchronized (lock) { Map> roomMap = SESSION_MAP.get(String.valueOf(scenarioId)); - if (roomMap.containsKey(room)) { - Map singleRoomMap = roomMap.get(room); - singleRoomMap.forEach((sessionId, session) -> { - try{ - session.getBasicRemote().sendText(message); - }catch (Exception e){ - log.error("error::",e); - } + if(roomMap!=null){ + if (roomMap.containsKey(room)) { + Map singleRoomMap = roomMap.get(room); + singleRoomMap.forEach((sessionId, session) -> { + try{ + session.getBasicRemote().sendText(message); + }catch (Exception e){ + log.error("error::",e); + } - }); + }); + } } + } } - private String testWeatherJson(String tag){ - ResponseCmdInfo responseCmdInfo = new ResponseCmdInfo(); - responseCmdInfo.setCmdType(tag); - responseCmdInfo.setRoom("123"); - responseCmdInfo.setScenarioId(2746); - Map data = new HashMap<>(); - data.put("begTime","2028-03-09 10:00:00"); - data.put("endTime","2028-03-19 00:20:00"); - return JSON.toJSONString(responseCmdInfo); - } + }