From 323d014b95241cd42dfa01227dd4a15575f58a2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 16 九月 2025 11:01:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java  |   26 ++++++------
 src/main/java/com/zy/asrs/task/OverYearLogScheduler.java |    6 +-
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java    |   34 ++++++++--------
 src/main/java/com/zy/asrs/task/AgvWarnScheduler.java     |    6 +-
 src/main/java/com/zy/common/config/ScheduleConfig.java   |    4 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
index bca34de..ba3471c 100644
--- a/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWarnScheduler.java
@@ -55,7 +55,7 @@
      *  鍒犻櫎鍛婅鏃ュ織
      */
     @Scheduled(cron = "0 0 1 * * ? ")
-    private void delWarnLog() {
+    public void delWarnLog() {
         String format = DateUtil.format(DateUtil.offsetMonth(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
         List<AgvWarnLog> agvWarnList = agvWarnLogService.selectList(new EntityWrapper<AgvWarnLog>().le("modi_time", format));
         for (AgvWarnLog agvWarn : agvWarnList) {
@@ -67,7 +67,7 @@
      * 瓒呰繃涓�鍒嗛挓娌℃洿鏂扮殑锛屽垹闄�
      */
     @Scheduled(fixedDelay = 10000)
-    private void del() {
+    public void del() {
         String format = DateUtil.format(DateUtil.offsetMinute(new Date(), -1), "yyyy-MM-dd HH:mm:ss");
         List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().le("modi_time", format));
         for (AgvWarn agvWarn : agvWarnList) {
@@ -76,7 +76,7 @@
     }
 
     @Scheduled(fixedDelay = 20000)
-    private void report() {
+    public void report() {
         List<Agv> agvs = agvBasMapper.selectList(new EntityWrapper<Agv>());
         Config first = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE1"));
         Config second = configService.selectOne(new EntityWrapper<Config>().eq("code", "AGV_WARN_RATE2"));
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 641de6c..60e7ec2 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -46,10 +46,10 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.鍗曞眰绉诲簱 || 12.璺ㄥ眰绉诲簱 || 108.鑷姩璋冩嫧 || 109.鎵嬪姩璋冩嫧)鐨勬暟鎹�
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 3000)
     public void excutePutwayWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 205)
+                .eq("wrk_sts", 205L)
                 .andNew().eq("io_type",53)
                 .or().eq("io_type",1)
                 .or().eq("io_type",57)
@@ -80,10 +80,10 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 3000)
     public void excuteCarryWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 206)
+                .eq("wrk_sts", 206L)
                 .andNew().eq("io_type",110)
                 .or().eq("io_type",101));
         if(!Cools.isEmpty(agvWrkMastList)){
@@ -103,10 +103,10 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 3000)
     public void excuteCarryWrk2(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 208)
+                .eq("wrk_sts", 208L)
                 .andNew().eq("io_type",110)
                 .or().eq("io_type",101));
         if(!Cools.isEmpty(agvWrkMastList)){
@@ -126,11 +126,11 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 3000)
+    @Scheduled(fixedDelay = 5000)
     public synchronized void startPutwayWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 201)
+                .eq("wrk_sts", 201L)
                 .andNew().eq("io_type", 53)
                 .or().eq("io_type", 1)
                 .or().eq("io_type", 10)
@@ -161,11 +161,11 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 4000)
     public void startAllcationIn(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
-                        .eq("wrk_sts", 211)
+                        .eq("wrk_sts", 211L)
                         .andNew().eq("io_type", 112)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
@@ -184,11 +184,11 @@
     瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓�(鍑哄簱绫诲瀷涓� 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 11.搴撴牸绉绘牻 || 110.绌烘澘鍑哄簱 || 107.鐩樼偣鍑哄簱)鐨勬暟鎹�
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 2000)
+    @Scheduled(fixedDelay = 4000)
     public void startCarryWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
-                        .eq("wrk_sts", 21)
+                        .eq("wrk_sts", 21L)
                         //.like("loc_no","@")
                         .andNew().eq("io_type", 101)
                         .or().eq("io_type", 103)
@@ -252,7 +252,7 @@
     鑷姩鐢熸垚绌烘澘鍑哄簱浠诲姟
      */
     //@Scheduled(cron = "0/1 * * * * ? ")
-    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 3000)
     public void autoEmptyOut(){
         boolean packageEmptyAutoOUt = Cools.eq("Y",Parameter.get().getPackageEmptyAutoOUt());
         boolean mateEmptyAutoOut = Cools.eq("Y",Parameter.get().getMateEmptyAutoOut());
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 6b8d368..7d875d2 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -68,7 +68,7 @@
      * crnNo :2鐩爣妤煎眰
      */
     @Scheduled(cron = "0/10 * * * * ? ")
-    private synchronized void execute2() {
+    public synchronized void execute2() {
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 22).andNew().eq("io_type", 108).andNew().eq("crn_no", 2).or().eq("crn_no", 3).orderBy("io_pri", false).orderBy("appe_time", true));
         if (agvWrkMastList.isEmpty()) {
             return;
@@ -112,7 +112,7 @@
      * ioType 111.鎵嬪姩璋冩嫧
      */
     @Scheduled(cron = "0/10 * * * * ? ")
-    private void execute3() {
+    public void execute3() {
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 22).andNew().eq("io_type", 111).orderBy("io_pri", false).orderBy("appe_time", true));
         if (agvWrkMastList.isEmpty()) {
             return;
@@ -127,8 +127,8 @@
 
     }
 
-    @Scheduled(cron = "0/2 * * * * ? ")
-    private void execute4() {
+    //@Scheduled(cron = "0/2 * * * * ? ")
+    public void execute4() {
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 22).andNew().eq("io_type", 114).orderBy("io_pri", false).orderBy("appe_time", true));
         if (agvWrkMastList.isEmpty()) {
             return;
@@ -145,7 +145,7 @@
 
 //    // 绌烘澘鑷姩鍥炲簱  搴撲綅-鎺ラ┏鐐�
 //    //@Scheduled(cron = "0/2 * * * * ? ")
-//    private void autoEmptyBack(){
+//    public void autoEmptyBack(){
 //        // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
 //        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
 //                new EntityWrapper<AgvLocMast>()
@@ -170,8 +170,8 @@
      * wrkSts 214.绌烘枡鏋跺洖娴佸緟鍒嗛厤
      * ioType 113.绌烘墭鐩樻墜鍔ㄥ洖娴�
      */
-    @Scheduled(cron = "0/2 * * * * ? ")
-    private void autoEmptyBack3() {
+    @Scheduled(cron = "0/4 * * * * ? ")
+    public void autoEmptyBack3() {
         // 宸ヤ綔妗d负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("wrk_sts", 214).eq("loc_no", "").eq("io_type", 113).orderBy("io_pri", false));
         if (agvWrkMastList.isEmpty()) {
@@ -215,7 +215,7 @@
      * 2妤兼垨3妤肩珯鐐瑰彲鍏ヤ俊鍙峰叏閮ㄦ病鏈夛紝浠h〃璧扮數姊嚜鍔ㄦ惉杩愭ā寮�
      */
     @Scheduled(cron = "0/30 * * * * ? ")
-    private void autoEmptyBack4() {
+    public void autoEmptyBack4() {
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
                 // TODO 鍥涙湡
                 .eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
@@ -266,7 +266,7 @@
      */
     // TODO 鍥涙湡
     @Scheduled(cron = "0/10 * * * * ? ")
-    private void autoEmptyBackSiqi() {
+    public void autoEmptyBackSiqi() {
         Config config2 = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_EMPTY"));
         //鍏堝垽鏂┖搴撲綅鏁颁簡
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_type1", 6).eq("floor", 1).eq("lev1", 2).eq("loc_sts", "O"));
@@ -307,7 +307,7 @@
     }
 
 
-    private void executeLocType6() {
+    public void executeLocType6() {
         // 鏌ヨ 浜屽巶鐨勭殑鍗婃垚鍝佺澹崇被鍨嬬殑绌鸿揣鏋�
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).in("floor", 2,3).orderBy("bay1",false));
         if (agvLocMasts.isEmpty()) {
@@ -322,7 +322,7 @@
         }
     }
 
-    private boolean determineFloorConnection(Integer floor) {
+    public boolean determineFloorConnection(Integer floor) {
         try {
             List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", floor).like("dev_no", "DB_"));
             if (!agvBasDevps.isEmpty()) {
@@ -345,8 +345,8 @@
      * 鎵嬪姩锛� 鐢熸垚 113 鎵嬪姩鍥炴祦
      * 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱
      */
-    @Scheduled(cron = "0/2 * * * * ? ")
-    private void autoEmptyBack5() {
+    @Scheduled(cron = "0/8 * * * * ? ")
+    public void autoEmptyBack5() {
         List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().ne("floor", 1).eq("loc_sts", "F").like("dev_no", "DB"));
         if (agvBasDevps.isEmpty()) {
             return;
@@ -365,7 +365,7 @@
      * 鎵嬪姩锛� 鐢熸垚 113 鎵嬪姩鍥炴祦
      */
     @Scheduled(cron = "0/30 * * * * ? ")
-    private void autoEmptyBack6() {
+    public void autoEmptyBack6() {
         List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", 1).eq("loc_sts", "F").like("dev_no", "DB"));
         if (agvBasDevps.isEmpty()) {
             return;
@@ -382,8 +382,8 @@
     /**
      * 璺ㄥ眰鑷姩绉诲簱
      */
-    @Scheduled(cron = "0/2 * * * * ? ")
-    private void autoEmptyBack7() throws ParseException {
+    @Scheduled(cron = "0/8 * * * * ? ")
+    public void autoEmptyBack7() throws ParseException {
         Date now = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String currentDay = sdf.format(now);
@@ -431,7 +431,7 @@
      * 鍦ㄥ簱浣嶄笉澶熺殑鎯呭喌涓嬶紝绠卞3鍏ュ簱鍒殑妤煎眰搴撲綅鐨勬椂鍊欙紝鏅氫笂杩涜璺ㄥ眰绉诲簱
      */
     @Scheduled(cron = "0/30 * * * * ? ")
-    private void autoEmptyBack8() throws ParseException {
+    public void autoEmptyBack8() throws ParseException {
         Date now = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String currentDay = sdf.format(now);
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index b67b758..25bf6dc 100644
--- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
@@ -19,15 +19,15 @@
     @Autowired
     private OverYearLogHandler overYearLogHandler;
 
-    @Scheduled(cron = "0/1 * * * * ? ")
-    private void execute(){
+    @Scheduled(cron = "0/3 * * * * ? ")
+    public void execute(){
         ReturnT<String> returnT = overYearLogHandler.start();
         if (!returnT.isSuccess()) {
             log.error(returnT.getMsg());
         }
     }
     @Scheduled(cron = "* * 1 * * ? ")
-    private void executeOrderLog() {
+    public void executeOrderLog() {
         ReturnT<String> returnT = overYearLogHandler.start2();
         if (!returnT.isSuccess()) {
             log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/common/config/ScheduleConfig.java b/src/main/java/com/zy/common/config/ScheduleConfig.java
index 6d5cb6f..dda6ab2 100644
--- a/src/main/java/com/zy/common/config/ScheduleConfig.java
+++ b/src/main/java/com/zy/common/config/ScheduleConfig.java
@@ -15,9 +15,9 @@
         //閲囩敤瀹氶暱鐨勭嚎绋嬫睜锛岄槻姝㈠畾鏃朵换鍔″紓甯告椂瀵艰嚧澶ч噺绾跨▼琚崰鐢紱
 
         // 鍒涘缓涓�涓� ScheduledThreadPoolExecutor锛屾牳蹇冪嚎绋嬫暟涓� 12锛屾渶澶х嚎绋嬫暟涓� 24
-        ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(12, new ThreadPoolExecutor.DiscardPolicy());
+        ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(3, new ThreadPoolExecutor.DiscardPolicy());
         // 璁剧疆鏈�澶х嚎绋嬫暟涓� 50
-        executor.setMaximumPoolSize(24);
+        executor.setMaximumPoolSize(6);
         taskRegistrar.setScheduler(executor);
     }
 }

--
Gitblit v1.9.1