From e128bbc4a9df1491257320884169ba813d461f63 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:33:20 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index 67ce8c5..4cb2a2a 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -60,12 +60,16 @@
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(118);add(122);
+ add(118);add(122);add(1907);
}};
@Scheduled(cron = "0/1 * * * * ? ")
private void execute(){
+ RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+ if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
+ return;
+ }
List<Integer> integersStaArr = new ArrayList<>();
List<int[]> stalistArr = new ArrayList<>();
for(Integer staNo : STA_WORK_CU){
@@ -74,10 +78,7 @@
new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", 11L));
stalistArr.add(new int[]{staNo, selectCount});
}
-
-// 鎸塻electCount闄嶅簭鎺掑簭锛堟渶澶х殑鎺掔涓�浣嶏級
- Collections.sort(stalistArr, (a, b) -> b[1] - a[1]); // 闄嶅簭鎺掑垪
-// 濡傛灉鎮ㄩ渶瑕佽浆涓烘暟缁勶紙鍙�夛級
+ Collections.sort(stalistArr, (a, b) -> b[1] - a[1]);
for (int[] staNowArr : stalistArr){
integersStaArr.add(staNowArr[0]);
}
@@ -90,7 +91,7 @@
continue;
}
if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
- if (!wrkMast.getStaNo().equals(122)){
+ if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){
continue;
}
}
@@ -100,7 +101,8 @@
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
continue;
}
- boolean wrkTypeSign = fullKM(wrkMast);
+// boolean wrkTypeSign = fullKM(wrkMast);
+ boolean wrkTypeSign = true;
if (!Cools.isEmpty(wrkMast)){
if (wrkTypeSign) {
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
@@ -133,8 +135,14 @@
continue;
}
- if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
- continue;
+ if (staNo==1907){
+ if (wrkMast.getWrkSts()!=2){
+ continue;
+ }
+ } else {
+ if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
+ continue;
+ }
}
// boolean wrkTypeSign = fullKM(wrkMast);
@@ -149,13 +157,17 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
@Scheduled(cron = "0/1 * * * * ? ")
private void execute2(){
+ RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+ if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
+ return;
+ }
try{
List<Integer> integersStaArr = new ArrayList<>();
List<int[]> stalistArr = new ArrayList<>();
--
Gitblit v1.9.1