From 74e0eb7a7e84b5006903e79554c007d9d5fbbcbc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 17:04:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 525a2ce..8b6f94c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -226,28 +226,84 @@
News.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+// siemensNet.Write("DB100.18", (short) 0);
// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[10];
array[0] = command.getAckFinish();
array[1] = command.getTaskNo();
array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
+ if (command.getSourcePosX()==4){
+ array[3] = 1;
+ }else if (command.getSourcePosX()==5){
+ array[3] = 2;
+ }else {
+ array[3] = command.getSourcePosX();
+ }
+
+
array[4] = command.getSourcePosY();
array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
+ if (command.getDestinationPosX()==4){
+ array[6] = 1;
+ }else if (command.getDestinationPosX()==5){
+ array[6] = 2;
+ }else {
+ array[6] = command.getDestinationPosX();
+ }
+
array[7] = command.getDestinationPosY();
array[8] = command.getDestinationPosZ();
array[9] = command.getCommand();
- OperateResult result = siemensNet.Write("DB100.0", array);
+ OperateResult result=null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ result = siemensNet.Write("DB100.0", array);
+ if(result.IsSuccess){
+ //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+ if (resultRead.IsSuccess) {
+ CrnCommand one = new CrnCommand();
+ one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
+ one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
+ one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
+ one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
+ one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
+ one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
+ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
+ one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
+ || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
+ || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
+ || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
+ ){
+ News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ }else{
+ //浠诲姟鍛戒护鍐欏叆鎴愬姛
+ log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(command), writeCount);
+ break;
+ }
+ }else {
+ writeCount++;
+ log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(command), writeCount);
+ }
+ } else {
+ writeCount++;
+ log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(command), writeCount);
+ }
+ }while (writeCount<5);
if (command.getAckFinish() == 0) {
- if (result.IsSuccess) {
- short commandFinish = 1;
- Thread.sleep(300);
- result = siemensNet.Write("DB100.18", commandFinish);
- }
+ short commandFinish = 1;
+ Thread.sleep(300);
+ result = siemensNet.Write("DB100.18", commandFinish);
+ log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(command), writeCount);
+ }else {
+ log.info("鏈啓鍏ュ爢鍨涙満鍛戒护"+command.getAckFinish());
}
+ log.info("鍫嗗灈鏈哄懡浠ゆ祴璇�-----"+command.getAckFinish());
try {
// 鏃ュ織璁板綍
--
Gitblit v1.9.1