From b3b5eb6bd7955afb4be48f0e34a18b92a38b102d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 18 十二月 2025 15:15:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index f2153ca..205d109 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -12,10 +12,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2023.07.25
@@ -43,7 +41,7 @@
//鍏ュ簱鍙�
public static final List<Integer> STA_WORK_IN = new ArrayList<Integer>() {{
- add(1042);add(1043);add(1104);add(1105);add(1038);add(1036);add(2037);
+ add(1042);add(1043);add(1044);add(1104);add(1105);add(1103);add(1038);add(1036);add(2037);
}};
//鍑哄簱鍙�
@@ -58,15 +56,16 @@
put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
+ put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);put(1103,1105);put(1044,1042);
}};
public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
- put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);
-
+ put(1043, 1042);put(1042, 1042);put(1044, 1042);put(1105, 1105);put(1104, 1105);
+ put(1103, 1105);put(1036, 1036);put(1038, 1038);put(2037,2037);
}};
// 寮傚父鍑哄簱鍙�
public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
- add(1042);add(1105);
+ add(1042);add(1105);add(1104);add(1043);add(1044);add(1103);
}};
// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
@@ -84,8 +83,10 @@
// }};
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void execute(){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String currentTime = sdf.format(new Date());
for(Integer staNo : STA_WORK_IN){
BasDevp basDevp = basDevpService.selectById(staNo);
basDevp.setDevNo(siteInMap.get(basDevp.getDevNo()));
@@ -94,7 +95,6 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
-// boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);//鍏ュ簱
if (result.getCode()==200){
@@ -114,36 +114,34 @@
if (Cools.isEmpty(wrkMast)){
continue;
}
-
-// if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
-// continue;
-// }
-// boolean wrkTypeSign = fullKM(wrkMast);
-
if (!Cools.isEmpty(wrkMast)){
-// if (wrkTypeSign){
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
if (result.getCode()==200) {
continue;
} else {
- System.out.println(staNo+"澶辫触3锛�");
+ System.out.println(staNo+"澶辫触2锛�");
}
}
}
}
-// for(Integer staNo: STA_WORK_Exception){
-// BasDevp basDevp = basDevpService.selectById(staNo);
-// basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
-// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
-// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
-// if (result.getCode()==200) {
-// continue;
-// } else {
-// System.out.println(staNo+"澶辫触3锛�");
-// }
-//
-// }
-// }
+ for(Integer staNo: STA_WORK_Exception){
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
+ if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//寮傚父閫�鍑�
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ continue;
+ }
+ if (result.getCode() == 200) {
+ System.out.println(staNo + "鏃堕棿锛�" + currentTime);
+ continue;
+ } else {
+ System.out.println(staNo+"澶辫触3锛�");
+ }
+
+ }
+ }
}
// @Scheduled(cron = "0/3 * * * * ? ")
--
Gitblit v1.9.1