From 295ee7dd14f5d36e2fe442714ab0a80c480c8029 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 15 十二月 2025 15:31:32 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index a9e8505..10d62ab 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -50,7 +50,7 @@
@Value("${led.id}")
private String ledId;
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void send() {
//楗煎浘
@@ -155,7 +155,7 @@
}
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void ErrorSend(){
Map<String,Object> map=new HashMap<>();
map.put("to",ledId);
@@ -174,11 +174,15 @@
}
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void TaskSend(){
Map<String,Object> map=new HashMap<>();
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;
}
@@ -188,25 +192,12 @@
return;
}
List<LedCommand> commandList = new ArrayList<>();
- if (basDevp.getDevMk().equals("I")){
- if (basDevp.getWrkNo() != 0){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (null != wrkMast){
- commandList = getCommandList(basDevp.getWrkNo().toString());
- }
+ 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,ledId);
- }else if (basDevp.getDevMk().equals("O")){
- BasDevp basDevpOut = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 1001));
- if (basDevp.getWrkNo() != 0){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpOut.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,ledId);
--
Gitblit v1.9.1