From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 21102b2..759b94e 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -33,7 +33,9 @@
IDLE(0, "绌洪棽"),
MOVING(1, "浣滀笟涓�"),
SOS(2, "鎶ヨ"),
- WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ WAITING(10, "绛夊緟纭"),
+ OFF_LINE(-1, "鏈煡"),
+ OTHER(100, "鍏跺畠"),
*/
public Short status;
@@ -80,7 +82,7 @@
/**
* 婊＄數
*/
- public Boolean fullCharge;
+ public Boolean fullCharge = false;
/**
* 浣庣數閲�
@@ -94,10 +96,32 @@
/**
* 褰撳墠浣嶇疆 1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
+ * NONE(0, "鏈煡"),
+ * POINT20(20, "A闈㈠钩绉昏溅"),
+ * POINT21(21, "纭寲缃怉绔�"),
+ * POINT22(22, "纭寲缃怋绔�"),
+ * POINT23(23, "B闈㈠钩绉昏溅"),
+ * POINT24(24, "姘存ЫA绔�"),
+ * POINT25(25, "姘存ЫB绔�"),
+ * POINT26(26, "B绔緭閫佺嚎"),
*/
public Short loca;
public SteLocaType locaType;
+
+ /**
+ * 褰撳墠浣嶇疆 1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
+ */
+ public Short locaStart;
+
+ public SteLocaType locaStartType;
+
+ /**
+ * 褰撳墠浣嶇疆 1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
+ */
+ public Short locaEnd;
+
+ public SteLocaType locaEndType;
/**
* 杩戠偣璺濈
@@ -195,7 +219,7 @@
/**
* 鍏呯數鐘舵�� 1锛氬湪鍏呯數锛�0锛氫笉鍦ㄥ厖鐢�
*/
- private Short chargeStatus;
+ private Short chargeStatus = -1;
// 鍏ュ簱鍙栫┖
private Boolean inEmpty;
@@ -226,6 +250,26 @@
this.loca = SteLocaType.get(type).id.shortValue();
}
+ public void setLocaStart(Short locaStart){
+ this.locaStart = locaStart;
+ this.locaStartType = SteLocaType.get(locaStart);
+ }
+
+ public void setLocaStart(SteLocaType type){
+ this.locaStartType = type;
+ this.locaStart = SteLocaType.get(type).id.shortValue();
+ }
+
+ public void setLocaEnd(Short locaEnd){
+ this.locaEnd = locaEnd;
+ this.locaEndType = SteLocaType.get(locaEnd);
+ }
+
+ public void setLocaEnd(SteLocaType type){
+ this.locaEndType = type;
+ this.locaEnd = SteLocaType.get(type).id.shortValue();
+ }
+
public void setHisTaskStatus(Short hisTaskStatus){
this.hisTaskStatus = hisTaskStatus;
this.hisTaskStatusType = SteHisTaskStatusType.get(hisTaskStatus);
--
Gitblit v1.9.1