From a5d3d6b0df0c0de059864e18e17aa690139a14f2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 19 六月 2023 15:53:07 +0800
Subject: [PATCH] log
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 26f23bc..9aa000f 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -364,6 +364,12 @@
//鎸囦护缁撴潫浣�
array[16] = command.getCommandEnd();
+ try {
+ Thread.sleep(1000);//鍛戒护涓嬪彂鍓嶄紤鐪�1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
OperateResult result = modbusTcpNet.Write("0", array);;
if (result != null && result.IsSuccess) {
News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
@@ -781,7 +787,6 @@
}
}
-
//涓嬪彂鍛戒护
if (!write(command)) {
News.error("鍥涘悜绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
@@ -789,10 +794,22 @@
} else {
News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙戞垚鍔燂紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(command));
- try {
- Thread.sleep(1000);//鍛戒护涓嬪彂瀹屽悗浼戠湢1s
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
+ BasShuttleOptService shuttleOptService = SpringUtils.getBean(BasShuttleOptService.class);
+ if (shuttleOptService != null) {
+ BasShuttleOpt opt = new BasShuttleOpt(
+ assignCommand.getTaskNo().intValue(),
+ assignCommand.getShuttleNo().intValue(),
+ new Date(),
+ ShuttleTaskModeType.get(assignCommand.getTaskMode()).desc,
+ assignCommand.getSourceLocNo(),
+ assignCommand.getLocNo(),
+ null,
+ null,
+ null,
+ JSON.toJSONString(command)
+ );
+ shuttleOptService.insert(opt);
}
//鍒ゆ柇鏁版嵁鏄惁鎵ц瀹屾垚
@@ -805,23 +822,6 @@
redisUtil.set("shuttle_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
}else {
//宸叉墽琛屽畬鎴�
- //淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
- BasShuttleOptService shuttleOptService = SpringUtils.getBean(BasShuttleOptService.class);
- if (shuttleOptService != null) {
- BasShuttleOpt opt = new BasShuttleOpt(
- assignCommand.getTaskNo().intValue(),
- assignCommand.getShuttleNo().intValue(),
- new Date(),
- ShuttleTaskModeType.get(assignCommand.getTaskMode()).desc,
- assignCommand.getSourceLocNo(),
- assignCommand.getLocNo(),
- null,
- null,
- null,
- JSON.toJSONString(assignCommand)
- );
- shuttleOptService.insert(opt);
- }
if (redisCommand.getLiftSecurityMk()) {
//鏇鹃攣瀹氳繃鎻愬崌鏈猴紝闇�瑕佽繘琛岃В閿�
--
Gitblit v1.9.1