From f70e3397fb1d108440ec3478bee8675687f0a1c3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 25 十一月 2024 08:40:40 +0800
Subject: [PATCH] 优化地图搜索及生成逻辑
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 70646f1..d69dedb 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -49,14 +49,15 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(fixedDelay = 5000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- //濡傛灉鏄姞宸ュ崟鍒欒繘琛屽垽鏂�
+ //濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
if (order.getDocType() == 33) {
//鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -72,18 +73,19 @@
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() {
+ //@Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(fixedDelay = 30000)
+ //@Async("orderThreadPool")
+ public synchronized void reportOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
@@ -94,7 +96,8 @@
/*
瀹氭椂鏌ヨ鐘舵�佷负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));
orderList.forEach(order -> {
--
Gitblit v1.9.1