From 4b697e4dd36fb63bce7428956593cf7c086773de Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 02 九月 2024 22:43:29 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 62 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index aad4505..7554728 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -187,47 +187,41 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
- if (crnProtocol.getMode() == 1) {
+ if (crnProtocol.getStatusType() == CrnStatusType.WAITING_ONE) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_ONE)) {
- if (resetFlag) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlag = false;
- }
+ if (resetFlag) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlag = false;
}
}
- } else if (crnProtocol.getMode() == 2) {
+ } else if (crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_TWO) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING_TWO)) {
- if (resetFlagTwo) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlagTwo = false;
- }
+ if (resetFlagTwo) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlagTwo = false;
}
}
- } else if (crnProtocol.getMode() == 3) {
+ } else if (crnProtocol.getStatusType() == CrnStatusType.WAITING_All && crnProtocol.getStatusTypeTwo() == CrnStatusType.WAITING_All) {
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING_All)) {
- if (resetFlag && resetFlagTwo) {
- if (crnProtocol.getTaskNo() == 9999) {
- backHpFlag = false;
- }
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setAckFinish((short) 1);
- if (write(crnCommand)) {
- resetFlag = false;
- resetFlagTwo = false;
- }
+ if (resetFlag && resetFlagTwo) {
+ if (crnProtocol.getTaskNo() == 9999) {
+ backHpFlag = false;
+ }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short) 1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+ resetFlagTwo = false;
}
}
}
--
Gitblit v1.9.1