From 39055848f739b024b4d1d3bcb856cf470f8c2f82 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 07 七月 2020 16:01:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/PlcLogScheduler.java | 2
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java | 1
src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java | 43 +++++++++++++++++++++
src/main/resources/UpdateThread.cs | 6 +-
src/main/java/com/zy/asrs/task/NotifyLogScheduler.java | 30 +++++++++++++++
5 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java b/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
new file mode 100644
index 0000000..93799d9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
@@ -0,0 +1,30 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.NotifyLogHandler;
+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 NotifyLogScheduler {
+
+ private static final Logger log = LoggerFactory.getLogger(NotifyLogScheduler.class);
+
+ @Autowired
+ private NotifyLogHandler notifyLogHandler;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ ReturnT<String> returnT = notifyLogHandler.start();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
index 63043fd..708392f 100644
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
@@ -23,7 +23,7 @@
private void execute(){
ReturnT<String> returnT = plcLogHandler.start();
if (!returnT.isSuccess()) {
- log.error( returnT.getMsg());
+ log.error(returnT.getMsg());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
new file mode 100644
index 0000000..2faf072
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
@@ -0,0 +1,43 @@
+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 NotifyLogHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+
+ @Transactional
+ public ReturnT<String> start() {
+ try {
+ // 鍏ュ簱閫氱煡妗ｈ浆鍘嗗彶妗�
+ int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where status = 'Y';");
+ if (pakInLog > 0) {
+ int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where status = 'Y';");
+ if (pakInDelete <= 0) {
+ exceptionHandle("鍏ュ簱閫氱煡妗ｈ浆鍘嗗彶妗ｅけ璐�");
+ }
+ }
+ // 鍑哄簱閫氱煡妗ｈ浆鍘嗗彶妗�
+
+ // 鐩樼偣閫氱煡妗ｈ浆鍘嗗彶妗�
+
+ } 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/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
index 547cedb..d2cecf1 100644
--- a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
@@ -20,6 +20,7 @@
@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();");
diff --git a/src/main/resources/UpdateThread.cs b/src/main/resources/UpdateThread.cs
index c9757b4..1c1c891 100644
--- a/src/main/resources/UpdateThread.cs
+++ b/src/main/resources/UpdateThread.cs
@@ -1699,13 +1699,13 @@
ProcLocToWorkData("11");
//澶勭悊宸ヤ綔妗ｇ姸鎬�4銆�14銆�6鐨勮祫鏂�
- ProcWorkMast("2");
+ ProcWorkMast("2"); // done
- //宸ヤ綔妗ｈ浆鍘嗗彶妗�
+ //宸ヤ綔妗ｈ浆鍘嗗彶妗� // done
ProcWorkToLog("3");
//鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。
- ProcDevCommandToLog("4");
+ ProcDevCommandToLog("4"); // done
//杞凡瀹屾垚鐗╂枡淇℃伅鍒板巻鍙叉。
//ProcMatCodeToLog("5");
--
Gitblit v1.9.1