From 91eca979b480dff62809368a5c6563c9e0fcc851 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 08 六月 2025 08:29:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 01eb951..f6cf40e 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -65,7 +65,13 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
         //鍏ュ簱7杞巻鍙叉。,绉诲簱7杞巻鍙叉。,鍑哄簱18杞�
-        List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().in("wrk_sts", 7,18));
+        List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+                .in("wrk_sts", 7,17)
+                .or()
+                .in("status",5,7));//鍙栨秷鎴栬�呭畬缁�
+        if(taskWrkList.size() == 0){
+            return;
+        }
         for (TaskWrk taskWrk : taskWrkList) {
             TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
             if(taskWrkLog.getIoType().equals(1)){
@@ -79,6 +85,16 @@
                 }
             }else if(taskWrkLog.getIoType().equals(2)){
                 BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("wrk_no",taskWrk.getWrkNo()));
+                if(taskWrk.getWrkNo()>=3001&&taskWrk.getWrkNo()<=6000){
+                    taskWrkLog.setWrkSts(18);
+                    taskWrkLog.setModiTime(new Date());
+                    if (!wrkLogService.insert(taskWrkLog)) {
+                        throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+                    }
+                    if (!taskWrkService.deleteById(taskWrk)) {
+                        throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                    }
+                }
                 if(basDevp==null){
                     HashMap<Object, Object> headParam = new HashMap<>();
                     String response = "";
@@ -95,6 +111,14 @@
                                 .doPost();
                         JSONObject jsonObject = JSON.parseObject(response);
                         if(jsonObject.get("ReturnStatus").equals(0)){
+                            taskWrkLog.setWrkSts(18);
+                            taskWrkLog.setModiTime(new Date());
+                            if (!wrkLogService.insert(taskWrkLog)) {
+                                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+                            }
+                            if (!taskWrkService.deleteById(taskWrk)) {
+                                throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                            }
                         }
                     } catch (Exception e){
                         log.error("wcs鎼鍑哄簱缁檞ms澶辫触{},杩斿洖鍊�={}", taskWrk, response);

--
Gitblit v1.9.1