From 0e5d494527de2350f6cb50166ce403cdd9e55b27 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 14:21:07 +0800
Subject: [PATCH] #websocket
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index 3cb3ce1..9903216 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;
@@ -149,30 +150,35 @@
}
-
@Scheduled(cron = "0/2 * * * * ? ")
- private void TaskOrErrorSend(){
+ private void ErrorSend(){
Map<String,Object> map=new HashMap<>();
map.put("to","1002");
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1002));
if (basDevp == null ){
return;
}
- if (Cools.isEmpty(basDevp.getDecDesc()) && basDevp.getWrkNo() == 0){
- map.put("message",Cools.add("type", "NoData"));
- }
- if (!Cools.isEmpty(basDevp.getDecDesc())){
- map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
+ map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+ }
- }else if (basDevp.getWrkNo() != 0){
+
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void TaskSend(){
+ Map<String,Object> map=new HashMap<>();
+ map.put("to","1002");
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1002));
+ if (basDevp == null ){
+ 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){
- return;
+ if (null != wrkMast){
+ commandList = getCommandList(basDevp.getWrkNo().toString());
}
- List<LedCommand> commandList = getCommandList(basDevp.getWrkNo().toString());
- map.put("message",Cools.add("type", "task").add("taskList",commandList));
}
-
+ map.put("message",Cools.add("type", "task").add("taskList",commandList));
webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
}
--
Gitblit v1.9.1