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 |   76 ++++++++++++++++++++++++++++++++++----
 1 files changed, 68 insertions(+), 8 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 5c1d5d7..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,6 +1,9 @@
 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;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -19,22 +22,32 @@
     /**
      * 浠诲姟鍙�
      */
-    public Short taskNo = 0;
+    private Short taskNo = 0;
 
     /**
-     * 鎺�
+     * 浠诲姟鎸囦护
      */
-    public Short row;
+    private ShuttleAssignCommand assignCommand;
 
     /**
-     * 鍒�
+     * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
      */
-    public Short bay;
+    private Integer protocolStatus;
 
     /**
-     * 灞�
+     * 褰撳墠灏忚溅鐘舵�佹灇涓�
      */
-    public Short lev;
+    private ShuttleProtocolStatusType protocolStatusType;
+
+    /**
+     * 婧愬簱浣�
+     */
+    private String sourceLocNo;
+
+    /**
+     * 鐩爣搴撲綅
+     */
+    private String locNo;
 
     /**
      * 灏忚溅蹇欑姸鎬佷綅
@@ -68,6 +81,11 @@
      * 閿欒缂栧彿
      */
     private Short errorCode;
+
+    /**
+     * 閿欒缂栧彿鏋氫妇
+     */
+    private ShuttleErrorCodeType errorCodeType;
 
     /**
      * Plc杈撳嚭鐘舵�両O
@@ -132,7 +150,7 @@
     /**
      * 浣滀笟鏍囪
      */
-    private String pakMk = "-";
+    private Boolean pakMk = true;
 
     // 浠诲姟淇℃伅 ---------------------------------------------------------
     /**
@@ -220,4 +238,46 @@
         this.busyStatusType = type;
     }
 
+    //鑾峰彇鐢垫睜鐢甸噺
+    public Short getBatteryPower$() {
+        return (short) (this.batteryPower * 0.1);
+    }
+
+    //鑾峰彇鐢垫睜娓╁害
+    public Short getBatteryTemp$() {
+        return (short) (this.batteryTemp * 0.1);
+    }
+
+    /**
+     * 璁剧疆灏忚溅鐘舵��
+     */
+    public void setProtocolStatus(Integer status) {
+        this.protocolStatus = status;
+        this.protocolStatusType = ShuttleProtocolStatusType.get(status);
+    }
+
+    /**
+     * 璁剧疆灏忚溅鐘舵��
+     */
+    public void setProtocolStatus(ShuttleProtocolStatusType status) {
+        this.protocolStatus = status.id;
+        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