From 153913f580c146bb7ce4102a5a68ef1e53ba89d5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 14:02:50 +0800
Subject: [PATCH] #websocket
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index cb5f612..3cb3ce1 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -153,26 +153,27 @@
@Scheduled(cron = "0/2 * * * * ? ")
private void TaskOrErrorSend(){
Map<String,Object> map=new HashMap<>();
-
+ map.put("to","1002");
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1002));
- if (basDevp == null || Cools.isEmpty(basDevp.getDecDesc()) || basDevp.getWrkNo() == 0){
+ 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("to","1002");
map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+
}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("to","1002");
map.put("message",Cools.add("type", "task").add("taskList",commandList));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
}
+
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
}
public List<LedCommand> getCommandList(String taskNo){
--
Gitblit v1.9.1