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 | 84 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1a86031..4423342 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,16 +1,22 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -23,25 +29,69 @@
private OrderSyncHandler orderSyncHandler;
@Autowired
private OrderService orderService;
+ @Autowired
+ private ApiLogService apiLogService;
- @Scheduled(cron = "0/3 * * * * ? ")
- private void queryAndSave(){
-// for (WrkMast wrkMast : wrkMasts) {
-// ReturnT<String> result = workLogHandler.start(wrkMast);
-// if (!result.isSuccess()) {
-// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
-// }
-// }
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void clearApiLog(){
+ try {
+ apiLogService.clearWeekBefore();
+ } catch (Exception e) {
+ log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
+ }
}
- @Scheduled(cron = "0/5 * * * * ? ")
- private void completeAndReport(){
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
- for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ @Resource
+ private ThreadPoolTaskExecutor orderThreadPool;
+
+ private final ReentrantLock lock = new ReentrantLock();
+
+// @Scheduled(cron = "0/5 * * * * ? ")
+ // 10鍒嗛挓鎵ц涓�娆�
+ @Scheduled(cron = "0 0/10 * * * ?")
+ public void completeAndReport() {
+ 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);
+ });
+ }
}
+ } finally {
+ lock.unlock();
}
}
--
Gitblit v1.9.1