From 184a0722e53f64f40ddb2c88f11f26941f565a8c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 十二月 2024 14:56:44 +0800
Subject: [PATCH] 上报逻辑调整
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 55b88d9..9c764f4 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,11 @@
package com.zy.asrs.task;
+import com.alibaba.fastjson.JSON;
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.entity.AgvLocDetl;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderDetlService;
@@ -14,11 +15,11 @@
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;
import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -49,7 +50,8 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(fixedDelay = 5000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -81,9 +83,10 @@
}
//@Scheduled(cron = "* 0/5 * * * ? ")
- @Scheduled(cron = "0/30 * * * * ? ")
- @Async("orderThreadPool")
- public synchronized 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 +97,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