From 001969849cbc4613cafee4d680f7d4ac19597fce Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 27 六月 2024 18:14:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
index 3a4b3f0..40c43d0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
@@ -2,7 +2,10 @@
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.zy.asrs.service.WrkMastExecuteLogService;
 import com.zy.asrs.service.WrkMastExecuteService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
@@ -22,16 +25,22 @@
 public class WrkMastExecuteHandler extends AbstractHandler<String> {
     @Autowired
     private WrkMastExecuteService wrkMastExecuteService;
+    @Autowired
+    private WrkMastExecuteLogService wrkMastExecuteLogService;
 
     public ReturnT<String> start(int[] excute) {
         try {
-            //淇濆瓨鍘嗗彶妗f
-            if (!wrkMastExecuteService.save(excute)){
-                log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
-            }
-            //鍒犻櫎宸ヤ綔妗f
-            if (!wrkMastExecuteService.delete(new EntityWrapper<WrkMastExecute>().eq("io_type",excute[0]).eq("wrk_sts",excute[1]).eq("wrk_type",2))){
-                log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+            WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectIoTypeAndWekSts(excute);
+            if (!Cools.isEmpty(wrkMastExecute)){
+                WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(wrkMastExecute);
+                //淇濆瓨鍘嗗彶妗f
+                if (!wrkMastExecuteLogService.insert(wrkMastExecuteLog)){
+                    log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
+                }
+                //鍒犻櫎宸ヤ綔妗f
+                if (!wrkMastExecuteService.deleteById(wrkMastExecute)){
+                    log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+                }
             }
         }catch (Exception e){
             log.error("寮傚父锛侊紒锛�"+e);

--
Gitblit v1.9.1