From 7d77a74eb0c5d7931bdfd9f61935689176e8819a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 15:10:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/PlcLogScheduler.java | 30 +++++++++++++++
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java | 38 +++++++++++++++++++
src/main/java/com/zy/asrs/task/AbstractHandler.java | 3 +
src/main/java/com/zy/asrs/task/core/ReturnT.java | 2
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 1
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 4 +-
src/main/java/com/zy/asrs/task/core/AsrsException.java | 2
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2
10 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java
index 54cd2b5..9e630fb 100644
--- a/src/main/java/com/zy/asrs/task/AbstractHandler.java
+++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -1,5 +1,8 @@
package com.zy.asrs.task;
+import com.zy.asrs.task.core.AsrsException;
+import com.zy.asrs.task.core.ReturnT;
+
import java.text.MessageFormat;
/**
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
new file mode 100644
index 0000000..63043fd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.PlcLogHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Component
+public class PlcLogScheduler {
+
+ private static final Logger log = LoggerFactory.getLogger(PlcLogScheduler.class);
+
+ @Autowired
+ private PlcLogHandler plcLogHandler;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ ReturnT<String> returnT = plcLogHandler.start();
+ if (!returnT.isSuccess()) {
+ log.error( returnT.getMsg());
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index fa2274c..f646212 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -2,17 +2,17 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
/**
* Created by vincent on 2020/7/7
*/
-@Component
+//@Component
public class WorkLogScheduler {
private static final Logger log = LoggerFactory.getLogger(WorkLogScheduler.class);
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 92be3a2..3b06a95 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -2,6 +2,7 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/zy/asrs/task/AsrsException.java b/src/main/java/com/zy/asrs/task/core/AsrsException.java
similarity index 88%
rename from src/main/java/com/zy/asrs/task/AsrsException.java
rename to src/main/java/com/zy/asrs/task/core/AsrsException.java
index d90d95a..7c0d744 100644
--- a/src/main/java/com/zy/asrs/task/AsrsException.java
+++ b/src/main/java/com/zy/asrs/task/core/AsrsException.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.task;
+package com.zy.asrs.task.core;
/**
* Created by vincent on 2020/7/7
diff --git a/src/main/java/com/zy/asrs/task/ReturnT.java b/src/main/java/com/zy/asrs/task/core/ReturnT.java
similarity index 97%
rename from src/main/java/com/zy/asrs/task/ReturnT.java
rename to src/main/java/com/zy/asrs/task/core/ReturnT.java
index 18e5ff9..26b8c12 100644
--- a/src/main/java/com/zy/asrs/task/ReturnT.java
+++ b/src/main/java/com/zy/asrs/task/core/ReturnT.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.task;
+package com.zy.asrs.task.core;
import java.io.Serializable;
diff --git a/src/main/java/com/zy/asrs/task/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
similarity index 97%
rename from src/main/java/com/zy/asrs/task/WcsDispatcher.java
rename to src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
index a42d386..64f09f0 100644
--- a/src/main/java/com/zy/asrs/task/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.task;
+package com.zy.asrs.task.core;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
diff --git a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
new file mode 100644
index 0000000..547cedb
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
@@ -0,0 +1,38 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Service
+public class PlcLogHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ @Transactional
+ public ReturnT<String> start() {
+ try {
+ int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
+ if (updateCount > 0) {
+ int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
+ if (deleteCount <= 0) {
+ exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+}
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 3402e4e..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,7 +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.asrs.task.core.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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 2d79440..2c99dc7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -4,7 +4,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.ReturnT;
+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;
--
Gitblit v1.9.1