From 39d84984a674ead4ce589c292565c5cef2631fda Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:18:23 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 11 -----------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 3 +++
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d467c61..7913470 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -57,15 +57,4 @@
}
}
- //娓呯悊鎵嬪姩鍛戒护
- @Scheduled(cron = "0/3 * * * * ? ")
- public void ManualCommandClean() {
- List<CommandInfo> commandInfos = commandInfoService.selectCompleteManualCommand();
- for (CommandInfo commandInfo : commandInfos) {
- //鎸囦护杞棩蹇�
- commandInfoService.saveToHistory(commandInfo.getId());
- }
-
- }
-
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 33aa4f8..d803b8b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -462,8 +462,11 @@
writeFlag = true;
log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ Date now = new Date();
+
//鏇存柊鎸囦护鐘舵��
commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//杈撻�佺嚎鐩存帴瀹屾垚鐘舵��
+ commandInfo.setCompleteTime(now);
commandInfoService.updateById(commandInfo);
//鏇存柊鎸囦护鏃ュ織
--
Gitblit v1.9.1