From 791c55e58b3fcae18eea0bd711450fcf2db5e16d Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期四, 16 十月 2025 16:42:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 22 +++++++++++++++-------
1 files changed, 15 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 c181b95..471249d 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -17,6 +17,7 @@
import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -46,6 +47,8 @@
private OrderDetlService orderDetlService;
@Autowired
private RedisUtil redisUtil;
+ @Value("${led.id}")
+ private String ledId;
@Scheduled(cron = "0/2 * * * * ? ")
private void send() {
@@ -155,8 +158,8 @@
@Scheduled(cron = "0/2 * * * * ? ")
private void ErrorSend(){
Map<String,Object> map=new HashMap<>();
- map.put("to","1002");
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1002));
+ map.put("to",ledId);
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId));
if (basDevp == null ){
return;
}
@@ -166,7 +169,7 @@
return;
}
map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc()));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002");
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
redisUtil.set(key,basDevp.getDecDesc(),15);
}
@@ -174,8 +177,12 @@
@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));
+ map.put("to",ledId);
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", ledId));
+ if (basDevp.getDevMk().equals("O")){
+ basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
+ }
+
if (basDevp == null ){
return;
}
@@ -185,14 +192,15 @@
return;
}
List<LedCommand> commandList = new ArrayList<>();
- if (basDevp.getWrkNo() != 0){
+
+ if (basDevp.getWrkNo() != 0 && basDevp.getLoading().equals("Y")){
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");
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,ledId);
redisUtil.set(key,basDevp.getWrkNo(),15);
}
--
Gitblit v1.9.1