From 964a867a0e8a0814ecd7152a8ef1266f664a014b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 11 十二月 2025 15:36:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/timer/LedWebsocket.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/timer/LedWebsocket.java b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
index 0d4ea9c..d2324eb 100644
--- a/src/main/java/com/zy/asrs/timer/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
@@ -118,7 +118,7 @@
}
//浠撳簱鏁版嵁
EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
- locDetlEntityWrapper.setSqlSelect("matnr,COUNT(*) as matnrCount").groupBy("matnr");
+ locDetlEntityWrapper.setSqlSelect("TOP 5 matnr,SUM(anfme) as matnrCount").groupBy("matnr").orderBy("matnrCount",false);
List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
Date now = new Date();
@@ -151,9 +151,17 @@
for (LedSlave slave : slaveProperties.getLed()) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
- map.put("to",slave.getStaArr().get(0).toString());
- map.put("message",Cools.add("type", "error").add("errMsg",ledThread.getErrorMsg().toString()));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getStaArr().get(0).toString());
+ if (!slave.getStaArr().isEmpty()){
+ map.put("to",slave.getStaArr().get(0).toString());
+ map.put("message",Cools.add("type", "error").add("errMsg",ledThread.getErrorMsg().toString()));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getStaArr().get(0).toString());
+ }else {
+ map.put("to",slave.getAgvStaArr().get(0));
+ map.put("message",Cools.add("type", "error").add("errMsg",ledThread.getErrorMsg().toString()));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getAgvStaArr().get(0));
+ }
+
+
}
}
@@ -166,9 +174,16 @@
for (LedSlave slave : slaveProperties.getLed()) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
- map.put("to",slave.getStaArr().get(0).toString());
- map.put("message",Cools.add("type", "task").add("taskList",ledThread.getCommandList()));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getStaArr().get(0).toString());
+ if (!slave.getStaArr().isEmpty()){
+ map.put("to",slave.getStaArr().get(0).toString());
+ map.put("message",Cools.add("type", "task").add("taskList",ledThread.getCommandList()));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getStaArr().get(0).toString());
+ }else {
+ map.put("to",slave.getAgvStaArr().get(0));
+ map.put("message",Cools.add("type", "task").add("taskList",ledThread.getCommandList()));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,slave.getAgvStaArr().get(0));
+ }
+
}
}
--
Gitblit v1.9.1