From 6daf900a09adcca981f620744bf89851654d88e0 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 05 八月 2025 09:58:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java index 2234aaf..77bde72 100644 --- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java +++ b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java @@ -5,6 +5,7 @@ import com.core.common.SpringUtils; import com.zy.asrs.controller.ConsoleController; import com.zy.asrs.controller.ForkLiftController; +import com.zy.asrs.controller.LiftController; import com.zy.asrs.controller.ShuttleController; import com.zy.common.model.WebSocketMessage; import lombok.Data; @@ -71,11 +72,16 @@ @OnMessage public void onMessage(String message, Session session) throws IOException { ShuttleController shuttleController = SpringUtils.getBean(ShuttleController.class); - ForkLiftController liftController = SpringUtils.getBean(ForkLiftController.class); + ForkLiftController forkLiftController = SpringUtils.getBean(ForkLiftController.class); + LiftController liftController = SpringUtils.getBean(LiftController.class); ConsoleController consoleController = SpringUtils.getBean(ConsoleController.class); WebSocketMessage socketMessage = JSON.parseObject(message, WebSocketMessage.class); if (socketMessage.getUrl().equals("/shuttle/table/shuttle/state")) { R result = shuttleController.shuttleStateTable(); + socketMessage.setData(JSON.toJSONString(result)); + this.sendMessage(JSON.toJSONString(socketMessage)); + } else if (socketMessage.getUrl().equals("/forkLift/table/lift/state")) { + R result = forkLiftController.liftStateTable(); socketMessage.setData(JSON.toJSONString(result)); this.sendMessage(JSON.toJSONString(socketMessage)); } else if (socketMessage.getUrl().equals("/lift/table/lift/state")) { @@ -86,6 +92,10 @@ R result = consoleController.getMapFromRedis(Integer.parseInt(socketMessage.getData())); socketMessage.setData(JSON.toJSONString(result)); this.sendMessage(JSON.toJSONString(socketMessage)); + } else if (socketMessage.getUrl().equals("/console/locMap/auth")) { + R result = consoleController.getLocMap(Integer.parseInt(socketMessage.getData())); + socketMessage.setData(JSON.toJSONString(result)); + this.sendMessage(JSON.toJSONString(socketMessage)); } // log.info("鏀跺埌鏉ヨ嚜杩炴帴锛�" + sessionId + "鐨勪俊鎭�:" + message); } -- Gitblit v1.9.1