From 21357f1d42f995e11e99a12a5f225fe6442b9ad1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 13:05:09 +0800
Subject: [PATCH] 优化定时任务及日志输出，调整订单同步逻辑
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 13fd364..363bd55 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,20 +1,17 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.*;
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.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -40,6 +37,9 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
+
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
try {
@@ -49,7 +49,8 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -72,19 +73,21 @@
continue;
}
}
-// ReturnT<String> result = orderSyncHandler.start(order);
-// if (!result.isSuccess()) {
-// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
-// }
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
}
}
}
//@Scheduled(cron = "* 0/5 * * * ? ")
- @Scheduled(cron = "0/5 * * * * ? ")
- @Async("orderThreadPool")
- public void reportOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
+ //@Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(fixedDelay = 30000)
+ //@Async("orderThreadPool")
+ public synchronized void reportOrder() {
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
});
@@ -94,11 +97,14 @@
/*
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
- @Scheduled(cron = "0 */1 * * * ? ")
+ //@Scheduled(cron = "0 */1 * * * ? ")
+ @Scheduled(fixedDelay = 60000)
public void completeOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo(), null);
+ if (order.getPltType() != null) {
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
+ }
});
}
--
Gitblit v1.9.1