From 75afa1c132100a8c6409faf3df04e5ee7c871a6f Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 14:12:33 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java |   13 +++-
 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java  |   78 ++++++++++++++++++++++++--
 src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java |   13 +++-
 src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java   |   31 ++++++++++
 4 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java
new file mode 100644
index 0000000..8f089fa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2023.07.25
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ */
+@Component
+public class WrkMastRgvTwoScheduler {
+    @Autowired
+    private WrkMastService wrkMastService;
+
+
+    public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
+        add(118);add(120);add(121);add(122);add(123);add(171);
+    }};
+
+    @Scheduled(cron = "0/1 * * * * ? ")
+    private void execute2(){
+
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index 5ff7c65..b187187 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -67,6 +67,10 @@
 
     @Scheduled(cron = "0/1 * * * * ? ")
     private void execute(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (rgvTwoSign.getRgvOneSign()!=0){
+            return;
+        }
         List<Integer> integersStaArr = new ArrayList<>();
         List<int[]> stalistArr = new ArrayList<>();
         for(Integer staNo : STA_WORK_CU){
@@ -157,6 +161,10 @@
 
     @Scheduled(cron = "0/1 * * * * ? ")
     private void execute2(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (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]);
             }
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
index 67ce8c5..cbe94cb 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -66,6 +66,10 @@
 
     @Scheduled(cron = "0/1 * * * * ? ")
     private void execute(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (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]);
         }
@@ -156,6 +157,10 @@
 
     @Scheduled(cron = "0/1 * * * * ? ")
     private void execute2(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (rgvTwoSign.getRgvOneSign()!=0){
+            return;
+        }
         try{
             List<Integer> integersStaArr = new ArrayList<>();
             List<int[]> stalistArr = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 4dfbb4a..0fbbe02 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -13,6 +13,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -41,8 +42,9 @@
 
 
     public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
-        add(101);add(102);add(104);add(105);add(107);add(108);add(110);add(111);add(113);add(114);add(116);add(117);
+        add(101);add(102);add(104);add(105);add(107);add(108);add(110);add(111);add(113);add(114);
     }};
+//        add(116);add(117);
 
     public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
         add(118);add(120);add(121);
@@ -55,17 +57,34 @@
         add(118);add(120);
     }};
     public static final List<Integer> STA_WORK_CU_CAR_FOUR  = new ArrayList<Integer>() {{
-        add(121);
+        add(121);add(118);
     }};
 
     public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
-        add(118);add(120);add(121);add(122);add(123);add(171);
+        add(118);add(120);add(121);add(122);add(123);
     }};
+//    add(171);
 
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0/1 * * * * ? ")
     private void execute(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (rgvTwoSign.getRgvOneSign()!=2){
+            return;
+        }
+        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});
+        }
+        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")){
@@ -143,10 +162,26 @@
         }
     }
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0/1 * * * * ? ")
     private void execute2(){
+        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
+        if (rgvTwoSign.getRgvOneSign()!=2){
+            return;
+        }
         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});
+            }
+            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")){
@@ -227,7 +262,7 @@
                 }
             }
 
-            for(Integer staNo : STA_WORK_CU){
+            for(Integer staNo : integersStaArr){
                 try{
                     BasDevp basDevp = basDevpService.selectById(staNo);
                     if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
@@ -351,4 +386,35 @@
         return false;
     }
 
+    public Integer getCrnNo(Integer staNo){
+        switch (staNo){
+            case 100:
+            case 101:
+            case 102:
+                return 1;
+            case 103:
+            case 104:
+            case 105:
+                return 2;
+            case 106:
+            case 107:
+            case 108:
+                return 3;
+            case 109:
+            case 110:
+            case 111:
+                return 4;
+            case 112:
+            case 113:
+            case 114:
+                return 5;
+            case 115:
+            case 116:
+            case 117:
+                return 6;
+            default:
+                return 0;
+        }
+    }
+
 }

--
Gitblit v1.9.1