From 7635dc25bd2a4d565df496b2d96354639966768d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 25 九月 2025 11:09:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
index ddf9b6d..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,27 +72,28 @@
@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("/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.barcodeOutput();
+ } 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