From f9095a69927575866c113a8db51f77a85f098c83 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 15:20:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 692146e..76cb0a0 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -308,15 +308,14 @@
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
Thread.sleep(200);
- int writeCount1 = 1;
+ int writeCount = 1;
do {
try{
if(!result.IsSuccess){
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
-// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
result = siemensNet.Write("DB100.0", array);
Thread.sleep(100);
- writeCount1++;
+ writeCount++;
continue;
}
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
@@ -344,20 +343,15 @@
log.error("鏃ュ織鎵撳嵃澶辫触锛�===>> [id:{}],{}", slave.getId(), JSON.toJSON(command));
}
}
-
try{
Thread.sleep(100);
}catch (Exception e){
}
-
-// News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
-// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount);
result = siemensNet.Write("DB100.0", array);
- writeCount1++;
+ writeCount++;
continue;
-
} else {
log.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
break;
@@ -366,8 +360,8 @@
}catch (Exception e){
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
}
- writeCount1++;
- } while (writeCount1<6);
+ writeCount++;
+ } while (writeCount<6);
if (command.getAckFinish() == 0) {
short commandFinish = 1;
@@ -387,7 +381,6 @@
log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
break;
}
-
}
}
--
Gitblit v1.9.1