From 17b218dcb63669a576e5e478ff3f889c9c6ab566 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 08 八月 2020 11:05:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 6b8c21f..b78196a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -8,16 +8,17 @@
 import com.zy.asrs.service.WrkMastLogService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * Created by vincent on 2020/7/6
  */
 @Service
-@Transactional
-public class WorkLogHandler extends AbstractHandler {
+public class WorkLogHandler extends AbstractHandler<String> {
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -28,27 +29,31 @@
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
 
-    public void start() {
-        WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
-        if (null == wrkMast) {
-            return;
+    @Transactional
+    public ReturnT<String> start(WrkMast wrkMast) {
+        try {
+            // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+                exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+            // 鍒犻櫎宸ヤ綔涓绘。
+            if (!wrkMastService.deleteById(wrkMast)) {
+                exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+            // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
+            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+//                exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+            // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+//                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
-        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
-            exceptionHandle(""); // todo
-        }
-        // 鍒犻櫎宸ヤ綔涓绘。
-        if (!wrkMastService.deleteById(wrkMast)) {
-            exceptionHandle(""); // todo
-        }
-        // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
-        if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-            exceptionHandle(""); // todo
-        }
-        // 鍒犻櫎宸ヤ綔鏄庣粏妗�
-        if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-            exceptionHandle(""); // todo
-        }
+        return SUCCESS;
     }
 
 }

--
Gitblit v1.9.1