From 6aa54366fa3c46567875e7df66dab43f4b897792 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 10:58:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AbstractHandler.java | 7 +++++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 5 +++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 27 ++++++---------------------
src/main/java/com/zy/asrs/task/WcsDispatcher.java | 16 +++++++++++++++-
4 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java
index 5fd205a..7dd306c 100644
--- a/src/main/java/com/zy/asrs/task/AbstractHandler.java
+++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -7,6 +7,13 @@
*/
public abstract class AbstractHandler {
+ public void run(){
+ boolean start = start();
+ System.out.println(start);
+ }
+
+ protected abstract boolean start();
+
protected void exceptionHandle(String errorMsg){
throw new CoolException("231");
}
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
index 0d47315..60cf51c 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/WcsDispatcher.java
@@ -2,6 +2,8 @@
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@
private WorkMastHandler workMastHandler;
@Autowired
private WorkLogHandler workLogHandler;
+ @Autowired
+ private ConfigService configService;
@PostConstruct
private void start(){
@@ -34,7 +38,17 @@
// workMastHandler.start();
- workLogHandler.start();
+ if(!workLogHandler.start()) {
+ Config config = new Config(
+ "name", // 鍚嶇О[闈炵┖]
+ "code", // 缂栫爜[闈炵┖]
+ "val", // 瀵瑰簲鍊糩闈炵┖]
+ (short)1, // 绫诲瀷[闈炵┖]
+ (short)1 // 鐘舵�乕闈炵┖]
+ );
+ boolean insert = configService.insert(config);
+ System.out.println(insert);
+ }
} catch (Exception e) {
log.error("Exception", e);
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 246986e..d0093a6 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,6 @@
import com.zy.asrs.service.WrkMastLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,19 +27,14 @@
private WrkDetlService wrkDetlService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private ConfigService configService;
- public void run(){
-
- }
-
- @Transactional(rollbackFor = Exception.class)
- public void start() {
+ @Override
+ @Transactional
+ public boolean start() {
try {
WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
if (null == wrkMast) {
- return;
+ return true;
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
@@ -62,17 +55,9 @@
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- Config config = new Config(
- "name", // 鍚嶇О[闈炵┖]
- "code", // 缂栫爜[闈炵┖]
- "val", // 瀵瑰簲鍊糩闈炵┖]
- (short)1, // 绫诲瀷[闈炵┖]
- (short)1 // 鐘舵�乕闈炵┖]
- );
- boolean insert = configService.insert(config);
- System.out.println(insert);
+ return false;
}
-
+ return true;
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index dfcc9da..ef6cf41 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -29,10 +29,10 @@
@Autowired
private WaitPakinService waitPakinService;
- public void start() {
+ public boolean start() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
- return;
+ return true;
}
for (WrkMast wrkMast : wrkMasts) {
// 4.鍏ュ簱瀹屾垚
@@ -43,6 +43,7 @@
doOut(wrkMast);
}
}
+ return true;
}
private void doIn(WrkMast wrkMast){
--
Gitblit v1.9.1