From ccce88e6d7d432eaa9d6e4d6e77f34cd872abd36 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 12:55:28 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/BareBoardScheduler.java   |    7 +++++--
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java   |    3 ++-
 src/main/java/com/zy/common/config/ThreadPoolConfig.java |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 8fc7d39..207b595 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -9,6 +9,7 @@
 import com.zy.system.entity.Config;
 import com.zy.system.service.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -36,7 +37,8 @@
     private WrkMastStaService wrkMastStaService;
 
     @Scheduled(cron = "0/10 * * * * ? ")
-    private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
+    @Async("orderThreadPool")
+    public void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
         if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
             BasDevp basDevp = basDevpService.selectById(213);
@@ -47,7 +49,8 @@
     }
 
     @Scheduled(cron = "0/3 * * * * ? ")
-    private void executeOne(){//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
+    @Async("orderThreadPool")
+    public void executeOne(){//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
         Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
         if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
             boolean sign = true;
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index abecc35..3c54210 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -50,7 +50,7 @@
     }
 
 //    @Scheduled(cron = "0/5 * * * * ? ")
-    @Async("orderThreadPool")
+//    @Async("orderThreadPool")
     public void completeAndReport(){
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
@@ -70,6 +70,7 @@
     }
 
     @Scheduled(cron = "0 0 * * * *")
+    @Async("orderThreadPool")
     public void completeAndReport2(){
         List<Order> orders = orderService.selectComplete();
         for (Order order : orders) {
diff --git a/src/main/java/com/zy/common/config/ThreadPoolConfig.java b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
index 1b21b47..151d85f 100644
--- a/src/main/java/com/zy/common/config/ThreadPoolConfig.java
+++ b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
@@ -24,7 +24,7 @@
         //璁剧疆鏈�澶х嚎绋嬫暟
         executor.setMaxPoolSize(core * 10 + core);
         //闄ゆ牳蹇冪嚎绋嬪鐨勭嚎绋嬪瓨娲绘椂闂�
-        executor.setKeepAliveSeconds(3);
+        executor.setKeepAliveSeconds(5);
         //缂撳啿闃熷垪
         executor.setQueueCapacity(core);
         executor.setThreadNamePrefix("order-task-");

--
Gitblit v1.9.1