From e4a7d5239f176c5cf5ba95b52c88366908d2ecfa Mon Sep 17 00:00:00 2001 From: L <L@123> Date: 星期三, 16 七月 2025 15:30:00 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | 68 ++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java index 188937a..67ce8c5 100644 --- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java +++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -63,9 +64,24 @@ }}; - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/1 * * * * ? ") private void execute(){ + 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")){ @@ -138,10 +154,25 @@ } } - @Scheduled(cron = "0/3 * * * * ? ") + @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")){ @@ -172,7 +203,7 @@ } if (basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){ if (basDevpEnd.getWrkNo()!=0 && basDevpEnd.getLoading().equals("Y")){ - WrkMast wrkMastEnd = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); + WrkMast wrkMastEnd = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpEnd.getWrkNo())); if (Cools.isEmpty(wrkMastEnd) || wrkMastEnd.getIoType()!=101 || Cools.isEmpty(wrkMastEnd.getSheetNo()) || wrkMastEnd.getSheetNo().equals("0")){ continue; } @@ -322,4 +353,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