From 323d014b95241cd42dfa01227dd4a15575f58a2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 16 九月 2025 11:01:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/AgvWarnScheduler.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..ba3471c 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -50,11 +50,12 @@
private AgvBasMapper agvBasMapper;
+
/**
* 鍒犻櫎鍛婅鏃ュ織
*/
@Scheduled(cron = "0 0 1 * * ? ")
- private void delWarnLog() {
+ public void delWarnLog() {
String format = DateUtil.format(DateUtil.offsetMonth(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
List<AgvWarnLog> agvWarnList = agvWarnLogService.selectList(new EntityWrapper<AgvWarnLog>().le("modi_time", format));
for (AgvWarnLog agvWarn : agvWarnList) {
@@ -66,7 +67,7 @@
* 瓒呰繃涓�鍒嗛挓娌℃洿鏂扮殑锛屽垹闄�
*/
@Scheduled(fixedDelay = 10000)
- private void del() {
+ public void del() {
String format = DateUtil.format(DateUtil.offsetMinute(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().le("modi_time", format));
for (AgvWarn agvWarn : agvWarnList) {
@@ -75,7 +76,7 @@
}
@Scheduled(fixedDelay = 20000)
- private void report() {
+ public void report() {
List<Agv> agvs = agvBasMapper.selectList(new EntityWrapper<Agv>());
Config first = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE1"));
Config second = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE2"));
@@ -92,7 +93,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 +112,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 +159,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