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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
index 75c45e1..77bde72 100644
--- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
+++ b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
@@ -4,6 +4,7 @@
import com.core.common.R;
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;
@@ -71,6 +72,7 @@
@OnMessage
public void onMessage(String message, Session session) throws IOException {
ShuttleController shuttleController = SpringUtils.getBean(ShuttleController.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);
@@ -78,20 +80,20 @@
R result = shuttleController.shuttleStateTable();
socketMessage.setData(JSON.toJSONString(result));
this.sendMessage(JSON.toJSONString(socketMessage));
- } else if (socketMessage.getUrl().equals("/lift/table/lift/state")) {
- R result = liftController.liftStateTable();
+ } 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("/console/latest/data/site")) {
- R result = consoleController.siteLatestData();
+ } else if (socketMessage.getUrl().equals("/lift/table/lift/state")) {
+ R result = liftController.liftStateTable();
socketMessage.setData(JSON.toJSONString(result));
this.sendMessage(JSON.toJSONString(socketMessage));
} else if (socketMessage.getUrl().equals("/console/map/auth")) {
R result = consoleController.getMapFromRedis(Integer.parseInt(socketMessage.getData()));
socketMessage.setData(JSON.toJSONString(result));
this.sendMessage(JSON.toJSONString(socketMessage));
- } else if (socketMessage.getUrl().equals("/console/barcode/output/site")) {
- R result = consoleController.crnOutput();
+ } 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));
}
--
Gitblit v1.9.1