From dad4b7fd3a7fcaed73d28f0ebd9e90d86ca21225 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 七月 2025 12:34:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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..ec77cf5 100644
--- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
+++ b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
@@ -4,7 +4,7 @@
import com.core.common.R;
import com.core.common.SpringUtils;
import com.zy.asrs.controller.ConsoleController;
-import com.zy.asrs.controller.LiftController;
+import com.zy.asrs.controller.ForkLiftController;
import com.zy.asrs.controller.ShuttleController;
import com.zy.common.model.WebSocketMessage;
import lombok.Data;
@@ -71,7 +71,7 @@
@OnMessage
public void onMessage(String message, Session session) throws IOException {
ShuttleController shuttleController = SpringUtils.getBean(ShuttleController.class);
- LiftController liftController = SpringUtils.getBean(LiftController.class);
+ ForkLiftController liftController = SpringUtils.getBean(ForkLiftController.class);
ConsoleController consoleController = SpringUtils.getBean(ConsoleController.class);
WebSocketMessage socketMessage = JSON.parseObject(message, WebSocketMessage.class);
if (socketMessage.getUrl().equals("/shuttle/table/shuttle/state")) {
@@ -82,16 +82,12 @@
R result = liftController.liftStateTable();
socketMessage.setData(JSON.toJSONString(result));
this.sendMessage(JSON.toJSONString(socketMessage));
- } else if (socketMessage.getUrl().equals("/console/latest/data/site")) {
- R result = consoleController.siteLatestData();
- 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