From 9dd23778d5b9a97da390abc4e6f785e60767acf4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 26 十月 2024 15:12:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 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..c14da80 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -32,13 +32,35 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
         List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
-        if (wrkMasts.isEmpty()) {
+        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
-            ReturnT<String> result = workLogHandler.start(wrkMast);
-            if (!result.isSuccess()) {
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMast);
+                if (!result.isSuccess()) {
+                    log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+                }
+            }catch (Exception e){
                 log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+                log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/3 * * * * ? ")
+    private void execute3(){
+        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
+        if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
+            return;
+        }
+        for (WrkMast wrkMast : wrkMasts) {
+            try{
+                wrkMast.setOveMk("Y");
+                wrkMastService.updateById(wrkMast);
+            }catch (Exception e){
+                log.error("宸ヤ綔妗workNo={}]鏍囪澶勭悊澶辫触", wrkMast.getWrkNo());
+                log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
             }
         }
     }
@@ -50,9 +72,14 @@
             return;
         }
         for (WrkMastSta wrkMastSta : wrkMastStaList) {
-            ReturnT<String> result = workLogHandler.start(wrkMastSta);
-            if (!result.isSuccess()) {
+            try{
+                ReturnT<String> result = workLogHandler.start(wrkMastSta);
+                if (!result.isSuccess()) {
+                    log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMastSta.getWrkNo());
+                }
+            }catch (Exception e){
                 log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMastSta.getWrkNo());
+                log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
             }
         }
     }

--
Gitblit v1.9.1