From 3fbfc558d4ed751664162d2e4406e7ef00cdc875 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 14:14:16 +0800
Subject: [PATCH] #websocket
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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..ca9bb14 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -149,33 +149,44 @@
}
-
@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()));
- }else if (basDevp.getWrkNo() != 0){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (null == wrkMast){
- return;
- }
- List<LedCommand> commandList = getCommandList(basDevp.getWrkNo().toString());
- map.put("message",Cools.add("type", "task").add("taskList",commandList));
+ }else {
+ map.put("message",Cools.add("type", "error").add("errMsg",""));
}
webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
}
+
+ @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){
+ commandList = getCommandList(basDevp.getWrkNo().toString());
+ }
+ }
+ map.put("message",Cools.add("type", "task").add("taskList",commandList));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+ }
+
public List<LedCommand> getCommandList(String taskNo){
List<LedCommand> commands = new ArrayList<>();
// 宸ヤ綔妗ｉ泦鍚�
--
Gitblit v1.9.1