From 3cb50aaf224b6a2afb98dc0bac0bb4ab10843b75 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 09 四月 2026 09:04:06 +0800
Subject: [PATCH] 定时任务循环未执行完放弃当次任务
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index ae32f65..4423342 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
/**
@@ -43,44 +44,54 @@
@Resource
private ThreadPoolTaskExecutor orderThreadPool;
+ private final ReentrantLock lock = new ReentrantLock();
+
// @Scheduled(cron = "0/5 * * * * ? ")
// 10鍒嗛挓鎵ц涓�娆�
@Scheduled(cron = "0 0/10 * * * ?")
public void completeAndReport() {
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- if (orders.isEmpty()) {
- return;
+ if (!lock.tryLock()) {
+ log.info("涓婁竴娆′换鍔℃湭鎵ц瀹岋紝璺宠繃鏈");
+ return;
+ }
+ try {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = orderService.selectComplete();
+ if (orders.isEmpty()) {
+ return;
+ }
+ // 鎸夊崟鎹被鍨嬪垎缁�
+ Map<String, List<Order>> groupedOrders = orders.stream()
+ .collect(Collectors.groupingBy(order -> {
+ String type = order.getDocType$();
+ switch (type) {
+ case "閲囪喘璁㈠崟":
+ case "閲囪喘鍒拌揣鍗�":
+ case "濮斿璁㈠崟":
+ case "濮斿鍒拌揣鍗�":
+ case "鍒拌揣鍗�":
+ case "鏉ユ枡妫�楠屽崟":
+ return "閲囪喘鍏ュ簱";
+ case "閿�鍞彂璐у崟":
+ return "閿�鍞嚭搴�";
+ case "鐢熶骇璁㈠崟":
+ case "妫�楠屽崟":
+ return "浜ф垚鍝佸叆搴撳崟";
+ case "棰嗘枡鐢宠鍗�":
+ return "鏉愭枡鍑哄簱鍗�";
+ default:
+ return type;
+ }
+ }));
+ for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
+ orderThreadPool.submit(() -> {
+ orderSyncHandler.startNew(map);
+ });
+ }
}
- // 鎸夊崟鎹被鍨嬪垎缁�
- Map<String, List<Order>> groupedOrders = orders.stream()
- .collect(Collectors.groupingBy(order -> {
- String type = order.getDocType$();
- switch (type) {
- case "閲囪喘璁㈠崟":
- case "閲囪喘鍒拌揣鍗�":
- case "濮斿璁㈠崟":
- case "濮斿鍒拌揣鍗�":
- case "鍒拌揣鍗�":
- case "鏉ユ枡妫�楠屽崟":
- return "閲囪喘鍏ュ簱";
- case "閿�鍞彂璐у崟":
- return "閿�鍞嚭搴�";
- case "鐢熶骇璁㈠崟":
- case "妫�楠屽崟":
- return "浜ф垚鍝佸叆搴撳崟";
- case "棰嗘枡鐢宠鍗�":
- return "鏉愭枡鍑哄簱鍗�";
- default:
- return type;
- }
- }));
- for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
- orderThreadPool.submit(() -> {
- orderSyncHandler.startNew(map);
- });
- }
+ } finally {
+ lock.unlock();
}
}
--
Gitblit v1.9.1