From cd506c91ff429eb676a14615cd034ecd1f286329 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 11:16:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 4dea664..a18576c 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -3,8 +3,12 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.WrkMastCrn;
+import com.zy.asrs.entity.WrkMastSplitTwin;
 import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastCrnService;
 import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.WrkMastSplitTwinService;
 import com.zy.asrs.service.WrkMastStaService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkLogHandler;
@@ -28,6 +32,10 @@
     private WrkMastService wrkMastService;
     @Autowired
     private WrkMastStaService wrkMastStaService;
+    @Autowired
+    private WrkMastSplitTwinService wrkMastSplitTwinService;
+    @Autowired
+    private WrkMastCrnService wrkMastCrnService;
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
@@ -36,9 +44,13 @@
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
-            ReturnT<String> result = workLogHandler.start(wrkMast);
-            if (!result.isSuccess()) {
-                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMast);
+                if (!result.isSuccess()) {
+                    log.error("wrkMast宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+                }
+            }catch (Exception e){
+                log.error("wrkMast宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMast.getWrkNo(),e.getMessage());
             }
         }
     }
@@ -46,13 +58,44 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute2(){
         List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts", 3));
-        if (Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()==0) {
-            return;
-        }
         for (WrkMastSta wrkMastSta : wrkMastStaList) {
-            ReturnT<String> result = workLogHandler.start(wrkMastSta);
-            if (!result.isSuccess()) {
-                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMastSta);
+                if (!result.isSuccess()) {
+                    log.error("wrkMastSta宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
+                }
+            }catch (Exception e){
+                log.error("wrkMastSta宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastSta.getWrkNo(),e.getMessage());
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/3 * * * * ? ")
+    private void execute3(){
+        List<WrkMastSplitTwin> wrkMastSplitTwinList = wrkMastSplitTwinService.selectList(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_sts", 4));
+        for (WrkMastSplitTwin wrkMastSplitTwin : wrkMastSplitTwinList) {
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMastSplitTwin);
+                if (!result.isSuccess()) {
+                    log.error("wrkMastSplitTwin宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSplitTwin.getWrkNo());
+                }
+            }catch (Exception e){
+                log.error("wrkMastSplitTwin宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastSplitTwin.getWrkNo(),e.getMessage());
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/3 * * * * ? ")
+    private void execute4(){
+        List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("wrk_sts", 4).or().eq("wrk_sts",14));
+        for (WrkMastCrn wrkMastCrn : wrkMastCrnList) {
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMastCrn);
+                if (!result.isSuccess()) {
+                    log.error("wrkMastCrn宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastCrn.getWrkNo());
+                }
+            }catch (Exception e){
+                log.error("wrkMastCrn宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�,寮傚父鍘熷洜={}", wrkMastCrn.getWrkNo(),e.getMessage());
             }
         }
     }

--
Gitblit v1.9.1