From f6ccffb2c8f4a5be8b4a887c6f0926f67053e504 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 08:49:46 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 cbf5498..a5110cd 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -195,6 +195,11 @@
public Float yDuration;
/**
+ * 鏃ュ織閲囬泦鏃堕棿
+ */
+ private Long deviceDataLog = System.currentTimeMillis();
+
+ /**
* 涓婁竴娆℃寚浠や笅鍙戞椂闂�
*/
private Long lastCommandTime = System.currentTimeMillis();
@@ -283,31 +288,31 @@
return basCrnp;
}
- public void setxSpeed(Short xSpeed) {
- this.xSpeed = Float.valueOf(xSpeed);
+ public void setxSpeed(Float xSpeed) {
+ this.xSpeed = (xSpeed);
}
- public void setySpeed(Short ySpeed) {
- this.ySpeed = Float.valueOf(ySpeed);
+ public void setySpeed(Float ySpeed) {
+ this.ySpeed =ySpeed;
}
- public void setzSpeed(Short zSpeed) {
- this.zSpeed = Float.valueOf(zSpeed);
+ public void setzSpeed(Float zSpeed) {
+ this.zSpeed = zSpeed;
}
- public void setxDistance(Short xDistance) {
- this.xDistance = Float.valueOf(xDistance);
+ public void setxDistance(Float xDistance) {
+ this.xDistance =xDistance;
}
- public void setyDistance(Short yDistance) {
- this.yDistance = Float.valueOf(yDistance);
+ public void setyDistance(Float yDistance) {
+ this.yDistance = yDistance;
}
- public void setxDuration(Short xDuration) {
- this.xDuration = Float.valueOf(xDuration);
+ public void setxDuration(Float xDuration) {
+ this.xDuration =xDuration;
}
- public void setyDuration(Short yDuration) {
+ public void setyDuration(Float yDuration) {
this.yDuration = Float.valueOf(yDuration);
}
--
Gitblit v1.9.1