From c3434b1fe0132372b34ff0a46d84e6129a094bfc Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 28 八月 2025 08:43:15 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/model/protocol/RgvProtocol.java |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 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 43d9bfb..8e984e1 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -97,6 +97,31 @@
      */
     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;
         this.modeType = RgvModeType.get(mode);
@@ -125,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);
     }
@@ -137,4 +170,53 @@
         this.xDuration = Float.valueOf(xDuration);
     }
 
+    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