From cce8b8793ca1466ca1330f3bd62e11ae6551261e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 13:51:58 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/core/model/protocol/RgvProtocol.java |  120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 6e317ff..8e984e1 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -18,9 +18,9 @@
      * 2 = 鑷姩妯″紡
      * 3 = 鐢佃剳妯″紡
      */
-    public Short mode;
+    public Short mode = -1;
 
-    public RgvModeType modeType;
+    public RgvModeType modeType = RgvModeType.NONE;
 
     /**
      * RGV褰撳墠鐘舵��
@@ -28,27 +28,32 @@
      * 1锛氫綔涓氫腑
      * 2锛氭姤璀�
      */
-    public Short status;
+    public Short status = -1;
 
     /**
      * 鐘舵�佹灇涓�
      */
-    public RgvStatusType statusType;
+    public RgvStatusType statusType = RgvStatusType.NONE;
 
     /**
      * 浠诲姟鍙�
      */
-    public Short taskNo = 0;
+    public Long taskNo = 0L;
 
     /**
-     * 宸ヤ綅1鏈夌墿
+     * 鏈夌墿
      */
-    public Short loaded;//0 鏃犵墿锛�1 鏈夌墿
+    public Short loaded = -1;//0 鏃犵墿锛�1 鏈夌墿
 
     /**
      * RGV褰撳墠浣嶇疆
      */
-    public Long RgvPos;
+    public Long RgvPos = 0L;
+
+    /**
+     * RGV鐩殑浣嶇疆
+     */
+    public Long RgvPosDestination = 0L;
 
     /**
      * 璧拌鍦ㄥ畾浣�
@@ -76,6 +81,46 @@
      * 绱璧拌鏃堕暱h
      */
     public Float xDuration;
+
+    /**
+     * 杞﹁韩
+     */
+    public Long carBodyJiaoMing = 2000L;
+
+    /**
+     * 杞﹁韩
+     */
+    public Long carBodyKunPeng = 15000L;
+
+    /**
+     * 鏄惁鍚敤
+     */
+    public boolean statusEnable;//0\1\2
+
+
+
+    // 鎬ュ仠
+    private boolean err1;
+
+    // 鏈夌墿鏃犺祫鏂�
+    private boolean err2;
+
+    // 鍛戒护閿欒璧拌閾炬潯鍐茬獊
+    private boolean err3;
+
+    // 鐩爣涓鸿秴杩囪蛋琛屾瀬闄�
+    private boolean err4;
+
+    // 鍙橀鍣ㄥ紓甯�
+    private boolean err5;
+
+    // 鍏夌數寮傚父
+    private boolean err6;
+    //灏忚溅妯″紡鍒囨崲閿欒
+    private boolean err7;
+    //鍏朵粬鏈煡寮傚父
+    private boolean err8;
+    private String errorRgv;
 
     public void setMode(Short mode) {
         this.mode = mode;
@@ -105,6 +150,14 @@
         return basRgv;
     }
 
+    public long getRgvPosDestinationOrPos(boolean sign){
+        if (!sign){
+            return RgvPosDestination>RgvPos? RgvPosDestination:RgvPos;
+        } else {
+            return RgvPosDestination<RgvPos? RgvPosDestination:RgvPos;
+        }
+    }
+
     public void setxSpeed(Short xSpeed) {
         this.xSpeed = Float.valueOf(xSpeed);
     }
@@ -117,10 +170,53 @@
         this.xDuration = Float.valueOf(xDuration);
     }
 
-    public Integer getRgvPosI(){
-        //闇�瑕佹牴鎹幇鍦烘敼閫�  鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
-        if (RgvPos==null) return 0;
-        return RgvPos.intValue();
+    public int getAlarm$(){
+        if (err1){
+            return 1;
+        }
+        if (err2){
+            return 2;
+        }
+        if (err3){
+            return 3;
+        }
+        if (err4){
+            return 4;
+        }
+        if (err5){
+            return 5;
+        }
+        if (err6){
+            return 6;
+        }
+        if (err7){
+            return 7;
+        }
+        if (err8){
+            return 8;
+        }
+        return 0;
+    }
+    public String getAlarmM(){
+        switch (getAlarm$()){
+            case 1:
+                return "鎬ュ仠";
+            case 2:
+                return "鏈夌墿鏃犺祫鏂�";
+            case 3:
+                return "鍛戒护閿欒璧拌閾炬潯鍐茬獊";
+            case 4:
+                return "鐩爣涓鸿秴杩囪蛋琛屾瀬闄�";
+            case 5:
+                return "鍙橀鍣ㄥ紓甯�";
+            case 6:
+                return "鍏夌數寮傚父";
+            case 7:
+                return "灏忚溅妯″紡鍒囨崲閿欒";
+            case 8:
+                return "鍏跺畠鏈煡寮傚父";
+        }
+        return "姝ｅ父";
     }
 
 }

--
Gitblit v1.9.1