From b92d79f72ff10c72fc0a300f407cabab3f252423 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 15:40:23 +0800
Subject: [PATCH] #websocket
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index ca9bb14..c181b95 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.common.service.CommonService;
+import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -43,6 +44,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private RedisUtil redisUtil;
@Scheduled(cron = "0/2 * * * * ? ")
private void send() {
@@ -157,14 +160,14 @@
if (basDevp == null ){
return;
}
- if (!Cools.isEmpty(basDevp.getDecDesc())){
- map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
-
- }else {
- map.put("message",Cools.add("type", "error").add("errMsg",""));
+ String key = "wms_websocket_error";
+ Object object = redisUtil.get(key);
+ if (null != object && object.equals(basDevp.getDecDesc())){
+ return;
}
-
+ map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+ redisUtil.set(key,basDevp.getDecDesc(),15);
}
@@ -176,6 +179,11 @@
if (basDevp == null ){
return;
}
+ String key = "wms_websocket_task";
+ Object object = redisUtil.get(key);
+ if (null != object && object.equals(basDevp.getWrkNo())){
+ return;
+ }
List<LedCommand> commandList = new ArrayList<>();
if (basDevp.getWrkNo() != 0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -185,6 +193,7 @@
}
map.put("message",Cools.add("type", "task").add("taskList",commandList));
webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+ redisUtil.set(key,basDevp.getWrkNo(),15);
}
public List<LedCommand> getCommandList(String taskNo){
--
Gitblit v1.9.1