From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0
---
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 0f22f31..74cf0f1 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -237,47 +237,31 @@
return response;
}
- if (!Cools.isEmpty(command.getLocNo())){
- OperateResult resultAck = siemensNet.Write("DB110." + command.getIndex() * 2, command.getValue());
- if (resultAck.IsSuccess) {
- Integer index = command.getIndex()*2 + 200;
- OperateResult resultAck1 = siemensNet.Write("DB110." + index, command.getValue());
- if (resultAck1.IsSuccess) {
- News.info("搴撲綅姗欒壊鎸夐挳鍛戒护涓嬪彂[locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- } else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- }
- News.info("搴撲綅鐧借壊鐏懡浠や笅鍙慬locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- } else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- }
- }
- }
-
- int writeConfirmIdx = 0;
- boolean commandConfirmResult = false;
- do {
- OperateResult result = siemensNet.Write("DB100.18", (short) 1);
- if (result.IsSuccess) {
- OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.18", (short) 2);
- if (commandReadResult.IsSuccess) {
- short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
- if (commandRead == 0) {
- Thread.sleep(500);
- }else {
- commandConfirmResult = true;
- break;
+ int writeConfirmIdx = 0;
+ boolean commandConfirmResult = false;
+ do {
+ OperateResult result = siemensNet.Write("DB100.18", (short) 1);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.18", (short) 2);
+ if (commandReadResult.IsSuccess) {
+ short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
+ if (commandRead == 0) {
+ Thread.sleep(500);
+ }else {
+ commandConfirmResult = true;
+ break;
+ }
}
}
- }
- writeConfirmIdx++;
- Thread.sleep(200);
- } while (writeConfirmIdx < 1);
+ writeConfirmIdx++;
+ Thread.sleep(200);
+ } while (writeConfirmIdx < 1);
- if (!commandConfirmResult) {
- News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
- response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
- return response;
+ if (!commandConfirmResult) {
+ News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
+ response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
+ return response;
+ }
}
News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
--
Gitblit v1.9.1