From ab2b8ef5df5edf24cf158dbcfc1a43b0629d644e Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 07 七月 2020 13:02:14 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 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 d0093a6..a411865 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; @@ -30,19 +32,19 @@ @Override @Transactional - public boolean start() { + public ReturnT<Config> start() { try { WrkMast wrkMast = wrkMastService.selectToBeHistoryData(); if (null == wrkMast) { - return true; + return SUCCESS; } // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� if (!wrkMastLogService.save(wrkMast.getWrkNo())) { exceptionHandle(""); // todo } // 鍒犻櫎宸ヤ綔涓绘。 - if (wrkMastService.deleteById(wrkMast)) { - exceptionHandle(""); // todo + if (!wrkMastService.deleteById(wrkMast)) { + exceptionHandle("1111"); // todo } // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 if (!wrkDetlLogService.save(wrkMast.getWrkNo())) { @@ -55,9 +57,16 @@ } catch (Exception e) { e.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return false; + Config config = new Config( + "name", // 鍚嶇О[闈炵┖] + "code", // 缂栫爜[闈炵┖] + "val", // 瀵瑰簲鍊糩闈炵┖] + (short)1, // 绫诲瀷[闈炵┖] + (short)1 // 鐘舵�乕闈炵┖] + ); + return FAIL.setMsg(e.getMessage()).setContent(config); } - return true; + return SUCCESS; } } -- Gitblit v1.9.1