From a159d70468d238504a2d705b738ca59bff7e7392 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 十二月 2025 10:45:06 +0800
Subject: [PATCH] #1901
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index 945ae5f..6923a30 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -50,7 +51,7 @@
}};
public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
- add(120);add(121);
+ add(1901);
}};
public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
add(120);
@@ -60,13 +61,32 @@
}};
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/3 * * * * ? ")
+ @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){
+ 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")){
@@ -134,15 +154,31 @@
}
}
}catch (Exception e){
- log.error("鑷姩琛ョ┖鏉縎TA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
+ log.error("STA_WORK_RU澶勭悊澶辫触锛屽綋鍓嶇珯鐐瑰彿锛�"+staNo+"寮傚父淇℃伅"+e);
}
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+ @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<>();
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")){
@@ -298,7 +334,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")){
@@ -307,6 +343,19 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
+ if (wrkMast.getStaNo()==1901){
+ boolean sign1901 = false;
+ List<WrkDetl> wrkDetlList1901 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ for (WrkDetl wrkDetl : wrkDetlList1901){
+ if (wrkDetl.getBrandArmType$()==999){
+ sign1901 = true;
+ break;
+ }
+ }
+ if (sign1901){
+ continue;
+ }
+ }
if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
@@ -314,7 +363,10 @@
continue;
}
Integer wrkMastStaNo = wrkMast.getStaNo();
- if (wrkMastStaNo<118 || wrkMastStaNo>121){
+ if (wrkMastStaNo==1901){
+ wrkMastStaNo = 122;
+ }
+ if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
continue;
}
String origin = null;
@@ -366,6 +418,9 @@
}
}
}
+ if (staNoOther==1901){
+ staNoOther = 122;
+ }
int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
if (countOther!=0){
@@ -374,6 +429,9 @@
BasDevp basDevpOther = basDevpService.selectById(staNoOther);
if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
continue;
+ }
+ if (staNoOther==122){
+ staNoOther = 1901;
}
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
@@ -398,4 +456,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