From 834af5f129efa7ecbc013086755ea007be6f66da Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 16:54:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 8a13a9c..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;
@@ -35,27 +36,29 @@
@Autowired
private WrkMastStaService wrkMastStaService;
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
+ @Scheduled(cron = "0/10 * * * * ? ")
+ @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);
- if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+ if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoadingSuper().equals("N") && basDevp.getLoading().equals("N") && basDevp.getReportSign()==0){
bareBoardHandler.start(213);
}
}
}
@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;
- WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
- WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+ List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
.eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
- if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
+ if (Cools.isEmpty(wrkMastStas) || wrkMastStas.isEmpty() || !Cools.isEmpty(wrkMastStaList) || !wrkMastStaList.isEmpty()){
sign=false;
}
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
--
Gitblit v1.9.1