From ae35f8d3521741b87835c6122053ec1af449d4ab Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 三月 2023 15:34:15 +0800
Subject: [PATCH] 地图数据增加上下左右移动距离
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 0a29623..401c763 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,5 +1,6 @@
package com.zy.core.model.protocol;
+import com.zy.core.enums.ShuttleErrorCodeType;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import com.zy.core.model.command.ShuttleAssignCommand;
@@ -80,6 +81,11 @@
* 閿欒缂栧彿
*/
private Short errorCode;
+
+ /**
+ * 閿欒缂栧彿鏋氫妇
+ */
+ private ShuttleErrorCodeType errorCodeType;
/**
* Plc杈撳嚭鐘舵�両O
@@ -233,8 +239,13 @@
}
//鑾峰彇鐢垫睜鐢甸噺
- public Short getBatteryPower() {
+ public Short getBatteryPower$() {
return (short) (this.batteryPower * 0.1);
+ }
+
+ //鑾峰彇鐢垫睜娓╁害
+ public Short getBatteryTemp$() {
+ return (short) (this.batteryTemp * 0.1);
}
/**
@@ -253,4 +264,20 @@
this.protocolStatusType = status;
}
+ /**
+ * 璁剧疆閿欒缂栧彿
+ */
+ public void setErrorCode(Short errorCode) {
+ this.errorCode = errorCode;
+ this.errorCodeType = ShuttleErrorCodeType.get(errorCode.intValue());
+ }
+
+ /**
+ * 璁剧疆閿欒缂栧彿
+ */
+ public void setErrorCode(ShuttleErrorCodeType type) {
+ this.errorCode = type.id.shortValue();
+ this.errorCodeType = type;
+ }
+
}
--
Gitblit v1.9.1