From d710a5c77363c3536a52864d1cfa723cc61b0a3d Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 10 四月 2024 09:57:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index aa8c63c..6e394fd 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -401,19 +401,22 @@
one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
//one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ 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));
// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
- || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
- || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ if (!one.getTaskNo().equals(array[1]) || !one.getAckFinish().equals(array[0])
+ || !one.getSourcePosZ().equals(array[5]) || !one.getSourcePosX().equals(array[3])
+ || !one.getSourcePosY().equals(array[4])
+ || !one.getDestinationPosZ().equals(array[8]) || !one.getDestinationPosX().equals(array[6])
+ || !one.getDestinationPosY().equals(array[7])
){
- log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("浼犲弬==鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
+ log.error("瀹炲彂==鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, crnCommand));
Thread.sleep(100);
@@ -567,22 +570,49 @@
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
Thread.sleep(500);
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ /*
+ *
+ * if (command.getTaskNo() == 0 && command.getAckFinish() == 0 && command.getAuto() != 1) {
+ command.setTaskNo((short) 999);
+ }
+
+ command.setCrnNo(slave.getId());
+ short[] array = new short[10];
+ if (Cools.isEmpty(command.getAckFinish())) {
+ array[0] = 5;
+ } else {
+ array[0] = command.getAckFinish();
+ }
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ array[9] = command.getCommand();
+ // 浣滀笟淇℃伅
+ OperateResult result = siemensNet.Write("DB100.0", array);
+ * */
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
//one.setTaskMode(siemensNet.getByteTransform().TransInt16(resultRead.Content, 4));
- one.setSourcePosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 6));
- one.setSourcePosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 8));
- one.setSourcePosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 10));
- one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
- one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
- one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ 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));
// one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
// one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
- if (!crnCommand.getTaskNo().equals(one.getTaskNo()) || !crnCommand.getAckFinish().equals(one.getAckFinish())
- || !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) || !crnCommand.getSourcePosX().equals(one.getSourcePosX()) || !crnCommand.getSourcePosY().equals(one.getSourcePosY())
- || !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) || !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) || !crnCommand.getDestinationPosY().equals(one.getDestinationPosY())
+ if (!one.getTaskNo().equals(array[1]) || !one.getAckFinish().equals(array[0])
+ || !one.getSourcePosZ().equals(array[5]) || !one.getSourcePosX().equals(array[3])
+ || !one.getSourcePosY().equals(array[4])
+ || !one.getDestinationPosZ().equals(array[8]) || !one.getDestinationPosX().equals(array[6])
+ || !one.getDestinationPosY().equals(array[7])
){
log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand));
--
Gitblit v1.9.1