From b02710d5e8077a125d2ad1959b096922aca8898a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 七月 2023 09:04:27 +0800
Subject: [PATCH] command write
---
src/main/java/com/zy/core/thread/LiftThread.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index ecc4c64..c78cd50 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -65,7 +65,7 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- readStatus();
+ read();
break;
// 鍐欏叆鏁版嵁
case 2:
@@ -109,6 +109,28 @@
@Override
public void close() {
modbusTcpNet.ConnectClose();
+ }
+
+ private void read() {
+ try {
+ readStatus();
+
+ //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
+ if (liftProtocol.getRunning()) {
+ liftProtocol.setPakMk(true);
+ }
+
+ //鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
+ if (!liftProtocol.getRunning()
+ && liftProtocol.getPakMk()
+ && liftProtocol.getTaskNo() != 0) {
+ //杩樻湁鏈畬鎴愮殑鍛戒护
+ executeWork(liftProtocol.getTaskNo());
+ }
+ } catch (Exception e) {
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ initLift();
+ }
}
private void readStatus() {
@@ -174,19 +196,6 @@
liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,16));
///璇诲彇鎻愬崌鏈虹姸鎬�-end
-
- //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
- if (liftProtocol.getRunning()) {
- liftProtocol.setPakMk(true);
- }
-
- //鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
- if (!liftProtocol.getRunning()
- && liftProtocol.getPakMk()
- && liftProtocol.getTaskNo() != 0) {
- //杩樻湁鏈畬鎴愮殑鍛戒护
- executeWork(liftProtocol.getTaskNo());
- }
//灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
@@ -264,6 +273,9 @@
}
for (int i = 0; i < 5; i++) {
+ if (command.getRun().intValue() == 4 || command.getRun().intValue() == 5) {
+ break;//绯荤粺澶嶄綅鍜岄摼鏉″仠姝㈣浆鍔ㄤ笉闇�瑕侀噸鍙�
+ }
readStatus();//閲嶆柊璇诲彇鐘舵��
if (liftProtocol.getRunning()) {
break;
@@ -274,14 +286,14 @@
News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {},娆℃暟锛歿}", slave.getId(), JSON.toJSON(command), i);
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2},娆℃暟锛歿}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command), i));
try {
- Thread.sleep(3000);//鍛戒护涓嬪彂鍚庝紤鐪�
+ Thread.sleep(300);//鍛戒护涓嬪彂鍚庝紤鐪�
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
return true;
} else {
- OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戝啓鍏ユ彁鍗囨満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}],娆℃暟锛歿}", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
News.error("鍐欏叆鎻愬崌鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
--
Gitblit v1.9.1