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/WrkMastStaInIt2Scheduler.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index 5ff7c65..db574b7 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -61,12 +61,16 @@
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(120);add(121);add(122);add(123);add(171);
+ add(120);add(121);add(123);add(171);
}};
@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){
@@ -150,13 +154,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<>();
@@ -166,10 +174,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]);
}
--
Gitblit v1.9.1