From 64b5946fd1a0cba0fbae54f7334167cb7adfdc97 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 11 十月 2024 19:20:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index b840b52..97f5101 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,10 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.BareBoardHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
import com.zy.system.entity.Config;
@@ -30,16 +28,56 @@
private ConfigService configService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private BasRgvService basRgvService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){//鑷姩璋冪┖鏉垮嚭搴�
- Config config = configService.selectById(10468);
+ private 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")){
- bareBoardHandler.start();
+ 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妤肩爜鍨涗綅缃�
+ 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;
+ List<WrkMastSta> wrkMastStas = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
+ .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
+ List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
+ .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+ 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"));
+ if (rgvOneSign.getRgvOneSign()!=1 || !sign){
+ sign = false;
+ }else {
+ List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
+ for (BasRgv basRgv : basRgvs){
+ if (basRgv.getLoaded2()!=0 && basRgv.getRgvSts()==3){
+ sign = false;
+ break;
+ }
+ }
+ }
+
+ if (sign){
+ bareBoardHandler.start(122);
+ }
+// BasDevp basDevp = basDevpService.selectById(213);
+// if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+// }
+ }
+ }
+
}
--
Gitblit v1.9.1