From da197adeb3fe32e90a9625b5cf2cb0097a3a00d9 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 08 七月 2020 09:41:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 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 b344fd6..a25d2ac 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -8,8 +8,7 @@ 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 com.zy.asrs.task.core.ReturnT; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -19,7 +18,7 @@ * Created by vincent on 2020/7/6 */ @Service -public class WorkLogHandler extends AbstractHandler<Config> { +public class WorkLogHandler extends AbstractHandler<String> { @Autowired private WrkMastService wrkMastService; @@ -30,41 +29,29 @@ @Autowired private WrkDetlLogService wrkDetlLogService; - @Override @Transactional - public ReturnT<Config> start() { + public ReturnT<String> start(WrkMast wrkMast) { try { - WrkMast wrkMast = wrkMastService.selectToBeHistoryData(); - if (null == wrkMast) { - return SUCCESS; - } // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� if (!wrkMastLogService.save(wrkMast.getWrkNo())) { - exceptionHandle("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�"); // todo + exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } // 鍒犻櫎宸ヤ綔涓绘。 if (wrkMastService.deleteById(wrkMast)) { - exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo()); // todo + exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo()); } // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 if (!wrkDetlLogService.save(wrkMast.getWrkNo())) { - exceptionHandle(""); // todo + exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } // 鍒犻櫎宸ヤ綔鏄庣粏妗� if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) { - exceptionHandle(""); // todo + exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } } catch (Exception e) { e.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - Config config = new Config( - "name", // 鍚嶇О[闈炵┖] - "code", // 缂栫爜[闈炵┖] - "val", // 瀵瑰簲鍊糩闈炵┖] - (short)1, // 绫诲瀷[闈炵┖] - (short)1 // 鐘舵�乕闈炵┖] - ); - return FAIL.setMsg(e.getMessage()).setContent(config); + return FAIL.setMsg(e.getMessage()); } return SUCCESS; } -- Gitblit v1.9.1