From 6c9cf8648e8f0cae079a7a540e0b0830693f7120 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期二, 15 七月 2025 15:35:19 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index 15499ea..67ce8c5 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -42,7 +42,7 @@
public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
- add(101);add(104);add(107);
+ add(101);add(102);add(104);add(105);add(107);add(108);
}};
public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
@@ -66,19 +66,22 @@
@Scheduled(cron = "0/1 * * * * ? ")
private void execute(){
- List<Integer> integers_STA_WORK_CU = new ArrayList<>();
- List<int[]> list = new ArrayList<>();
+ List<Integer> integersStaArr = new ArrayList<>();
+ List<int[]> stalistArr = new ArrayList<>();
for(Integer staNo : STA_WORK_CU){
Integer crnNo = getCrnNo(staNo);
int selectCount = wrkMastService.selectCount(
- new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", 11));
- list.add(new int[]{staNo, selectCount});
+ new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", 11L));
+ stalistArr.add(new int[]{staNo, selectCount});
}
// 鎸塻electCount闄嶅簭鎺掑簭锛堟渶澶х殑鎺掔涓�浣嶏級
- Collections.sort(list, (a, b) -> b[1] - a[1]); // 闄嶅簭鎺掑垪
+ Collections.sort(stalistArr, (a, b) -> b[1] - a[1]); // 闄嶅簭鎺掑垪
// 濡傛灉鎮ㄩ渶瑕佽浆涓烘暟缁勶紙鍙�夛級
- for(Integer staNo : integers_STA_WORK_CU){
+ for (int[] staNowArr : stalistArr){
+ integersStaArr.add(staNowArr[0]);
+ }
+ for(Integer staNo : integersStaArr){
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
@@ -154,7 +157,22 @@
@Scheduled(cron = "0/1 * * * * ? ")
private void execute2(){
try{
+ List<Integer> integersStaArr = new ArrayList<>();
+ List<int[]> stalistArr = new ArrayList<>();
for(Integer staNo : STA_WORK_CU){
+ Integer crnNo = getCrnNo(staNo);
+ int selectCount = wrkMastService.selectCount(
+ 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]); // 闄嶅簭鎺掑垪
+// 濡傛灉鎮ㄩ渶瑕佽浆涓烘暟缁勶紙鍙�夛級
+ for (int[] staNowArr : stalistArr){
+ integersStaArr.add(staNowArr[0]);
+ }
+ for(Integer staNo : integersStaArr){
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
@@ -334,8 +352,6 @@
}
return false;
}
-
-
public Integer getCrnNo(Integer staNo){
switch (staNo){
--
Gitblit v1.9.1