From dc078dbd74d0028cdedb4210f0b892f88c86e41c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 13:12:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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 ec51266..b344fd6 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -8,6 +8,8 @@
 import com.zy.asrs.service.WrkMastLogService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.ReturnT;
+import com.zy.system.entity.Config;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +19,7 @@
  * Created by vincent on 2020/7/6
  */
 @Service
-public class WorkLogHandler extends AbstractHandler {
+public class WorkLogHandler extends AbstractHandler<Config> {
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -28,20 +30,21 @@
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
 
+    @Override
     @Transactional
-    public void start() {
+    public ReturnT<Config> start() {
         try {
             WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
             if (null == wrkMast) {
-                return;
+                return SUCCESS;
             }
             // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
             if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
-                exceptionHandle(""); // todo
+                exceptionHandle("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�"); // todo
             }
             // 鍒犻櫎宸ヤ綔涓绘。
-            if (!wrkMastService.deleteById(wrkMast)) {
-                exceptionHandle(""); // todo
+            if (wrkMastService.deleteById(wrkMast)) {
+                exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo()); // todo
             }
             // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
             if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
@@ -54,9 +57,16 @@
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            // todo
+            Config config = new Config(
+                    "name",    // 鍚嶇О[闈炵┖]
+                    "code",    // 缂栫爜[闈炵┖]
+                    "val",    // 瀵瑰簲鍊糩闈炵┖]
+                    (short)1,    // 绫诲瀷[闈炵┖]
+                    (short)1    // 鐘舵�乕闈炵┖]
+            );
+            return FAIL.setMsg(e.getMessage()).setContent(config);
         }
-
+        return SUCCESS;
     }
 
 }

--
Gitblit v1.9.1