From 9beae5f38c4cfe95560601fc4638923a34f393e9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 14 二月 2025 13:17:57 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/task/AgvWarnScheduler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
index fd5450b..bc086b1 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -92,7 +92,11 @@
}
if (DateUtil.offsetMinute(new Date(), -warnTime).after(begin)) {
buffer = new StringBuffer();
- buffer.append(processRegion(agvs, agvWarn.getRobotCode()) + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
+ String s = processRegion(agvs, agvWarn.getRobotCode());
+ if (s == null) {
+ continue;
+ }
+ buffer.append(s + "[" + agvWarn.getRobotCode() + "]鍙稟GV灏忚溅鎶ヨ浜哱n");
buffer.append("鎶ヨ绫诲瀷锛�" + agvWarn.getWarnContent() + "\n");
if (!Cools.isEmpty(agvWarn.getSourceLocNo())) {
buffer.append("浠�:[" + agvWarn.getSourceLocNo() + "]鍒癧" + agvWarn.getLocNo() + "]\n");
@@ -107,7 +111,6 @@
data.put("content", buffer.toString());
param.put("msgtype", "text");
param.put("text", data);
-
sendData.put(agvWarn.getRobotCode() + agvWarn.getWarnContent(), param);
}
for (HashMap.Entry<String, Object> entry : sendData.entrySet()) {
@@ -155,6 +158,9 @@
}
for (Agv agv : agvs) {
if (agv.getAgvNo() != null && agv.getAgvNo().equals(agvNo)) {
+ if (!Cools.isEmpty(agv.getFlag()) && agv.getFlag() == 1) {
+ return null;
+ }
return agv.getRegion();
}
}
--
Gitblit v1.9.1