From c85706a1e0794dbbc7f41952d70eacb795802112 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 11:19:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 7 ++++---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 13 +++++++++----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 2e8b060..4164f37 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -140,17 +140,22 @@
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
*/
- public Integer xDistance;
+ public Float xDistance;
/**
* 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
*/
- public Integer yDistance;
+ public Float yDistance;
/**
- * 鍫嗗灈鏈虹疮璁¤繍琛屾椂闀縣
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
*/
- public Integer duration;
+ public Float xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Float yDuration;
public void setMode(Short mode) {
this.mode = mode;
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 16ade31..915c442 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -133,9 +133,10 @@
crnProtocol.setXSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setYSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
crnProtocol.setZSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransInt32(result.Content, 34));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransInt32(result.Content, 38));
- crnProtocol.setDuration(siemensNet.getByteTransform().TransInt32(result.Content, 42));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 46));
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
--
Gitblit v1.9.1