From c7e0d3c39f792fe17e64d7c7e14b0a285f0c012f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 16:40:14 +0800
Subject: [PATCH] #websocket
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index 22046ec..a9e8505 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -188,11 +188,25 @@
return;
}
List<LedCommand> commandList = new ArrayList<>();
- if (basDevp.getWrkNo() != 0){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (null != wrkMast){
- commandList = getCommandList(basDevp.getWrkNo().toString());
+ if (basDevp.getDevMk().equals("I")){
+
+ if (basDevp.getWrkNo() != 0){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (null != wrkMast){
+ commandList = getCommandList(basDevp.getWrkNo().toString());
+ }
}
+ map.put("message",Cools.add("type", "task").add("taskList",commandList));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
+ }else if (basDevp.getDevMk().equals("O")){
+ BasDevp basDevpOut = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
+ if (basDevp.getWrkNo() != 0){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOut.getWrkNo()));
+ if (null != wrkMast){
+ commandList = getCommandList(basDevp.getWrkNo().toString());
+ }
+ }
+
}
map.put("message",Cools.add("type", "task").add("taskList",commandList));
webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
--
Gitblit v1.9.1