From ccc39836716ba323c946cddc78a62049731ebb46 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:43:33 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 a3ac6cb..70a9b8a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -88,7 +88,6 @@
* 1 = 涓婂畾浣�
*/
public Short liftPos;
- public Short liftPosTwo;
public CrnLiftPosType liftPosType;
public CrnLiftPosType liftPosTypeTwo;
@@ -240,15 +239,7 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setLiftPosTwo(Short liftPosTwo) {
- this.liftPosTwo = liftPosTwo;
- this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
- }
- public void setLiftPosTwo(CrnLiftPosType typeTwo) {
- this.liftPosTypeTwo = typeTwo;
- this.liftPosTwo = CrnLiftPosType.get(typeTwo).id.shortValue();
- }
public void setStatus(Short status){
this.status = status;
@@ -292,31 +283,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