From 37bdbc67236066dde69299d4eef3e93232aa1e4f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 15:01:24 +0800
Subject: [PATCH] 移除冗余Autowired注解，优化订单同步逻辑
---
src/main/java/com/zy/asrs/task/AgvWarnScheduler.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
index 3dbc5f2..5a653bc 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -8,7 +8,9 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Agv;
import com.zy.asrs.entity.AgvWarn;
+import com.zy.asrs.entity.AgvWarnLog;
import com.zy.asrs.mapper.AgvBasMapper;
+import com.zy.asrs.service.AgvWarnLogService;
import com.zy.asrs.service.AgvWarnService;
import com.zy.asrs.task.handler.AgvWarnHandler;
import com.zy.common.utils.HttpHandler;
@@ -40,10 +42,26 @@
private AgvWarnService agvWarnService;
@Autowired
+ private AgvWarnLogService agvWarnLogService;
+
+ @Autowired
private ConfigService configService;
@Autowired
private AgvBasMapper agvBasMapper;
+
+
+ /**
+ * 鍒犻櫎鍛婅鏃ュ織
+ */
+ @Scheduled(cron = "0 0 1 * * ? ")
+ private 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) {
+ agvWarnLogService.deleteById(agvWarn);
+ }
+ }
/**
* 瓒呰繃涓�鍒嗛挓娌℃洿鏂扮殑锛屽垹闄�
@@ -66,6 +84,7 @@
Config url = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_REPORT_URL"));
List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>());
StringBuffer buffer;
+ HashMap<String, Object> sendData = new HashMap<>();
for (AgvWarn agvWarn : agvWarnList) {
Integer warnTime = getWarnTime(agvWarn.getTimes(), first.getValue(), second.getValue(), third.getValue());
DateTime begin = DateUtil.parse(agvWarn.getBeginTime(), "yyyy-MM-dd HH:mm:ss");
@@ -76,23 +95,22 @@
if (!Cools.isEmpty(agvWarn.getSourceLocNo())) {
buffer.append("浠�:[" + agvWarn.getSourceLocNo() + "]鍒癧" + agvWarn.getLocNo() + "]\n");
}
- buffer.append("寮�濮嬫椂闂�:" + agvWarn.getBeginTime() + "\n");
+ buffer.append("鎶ヨ寮�濮嬫椂闂�:" + agvWarn.getBeginTime() + "\n");
+ buffer.append("褰撳墠鏃堕棿:" + DateUtil.formatDateTime(new Date()) + "\n");
int i = agvWarn.getTimes() + 1;
- buffer.append("绗琜" + i + "]娆℃姤璀�");
+ //buffer.append("绗琜" + i + "]娆℃姤璀�");
HashMap<String, Object> param = new HashMap<>();
HashMap<String, Object> data = new HashMap<>();
data.put("content", buffer.toString());
param.put("msgtype", "text");
param.put("text", data);
- log.info("鍙戦�佹姤璀︿俊鎭細{}", JSON.toJSONString(param));
+ //log.info("鍙戦�佹姤璀︿俊鎭細{}", JSON.toJSONString(param));
+ sendData.put(agvWarn.getRobotCode() + agvWarn.getWarnContent(), param);
+ }
+ for (HashMap.Entry<String, Object> entry : sendData.entrySet()) {
String response = null;
try {
- response = new HttpHandler.Builder()
- .setUri(url.getValue())
- .setJson(JSON.toJSONString(param))
- .setHttps(true)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(url.getValue()).setJson(JSON.toJSONString(entry.getValue())).setHttps(true).build().doPost();
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -106,6 +124,7 @@
log.error("鍙戦�佸け璐ワ紝閿欒淇℃伅锛歿}", jsonObject.get("errmsg"));
}
}
+
}
}
@@ -119,9 +138,9 @@
case 0:
return Integer.parseInt(first);
case 1:
- return Integer.parseInt(second);
+ return Integer.parseInt(first) + Integer.parseInt(second);
case 2:
- return Integer.parseInt(thrid);
+ return Integer.parseInt(first) + Integer.parseInt(second) + Integer.parseInt(thrid);
default:
return (times - 2) * Integer.parseInt(thrid) + Integer.parseInt(first) + Integer.parseInt(second) + Integer.parseInt(thrid);
}
--
Gitblit v1.9.1