From cdca466c533197157f3255b77fbdb4aac89be064 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 30 八月 2023 08:26:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
index c6d3533..8d62e39 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -186,7 +186,7 @@
     /**
      * 鏁呴殰鐮�
      */
-    private List<Integer> errCode;
+    private Integer errCode;
 
     /**
      * mileage鎬婚噷绋嬫暟(绫�)锛宭iftNumber椤跺崌鎬绘暟dropNumber涓嬮檷鎬绘暟reversingX鎹鎬绘暟reversingY鎹鎬绘暟
@@ -235,7 +235,14 @@
         if (this.getFree() == null) {
             return "";
         }
-        return this.getFree() == 1 ? "绌洪棽" : "杩愯涓�";
+        return this.getFree() == 0 ? "杩愯涓�" : "绌洪棽";
+    }
+
+    public String getWorkingMode$() {
+        if (this.getWorkingMode() == null) {
+            return "";
+        }
+        return this.getWorkingMode() == 0 ? "鎵嬪姩" : "鑷姩";
     }
 
     public String getLoadState$() {
@@ -264,7 +271,7 @@
             return "";
         }
 
-        switch (this.getRunDir()) {
+        switch (this.getLiftPosition()) {
             case 0:
                 return "鏈煡";
             case 1:
@@ -393,6 +400,13 @@
         return NavigatePositionConvert.nyXyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
     }
 
+    public String getPoint$$() {
+        if (this.getPoint() == null) {
+            return "";
+        }
+        return JSON.toJSONString(this.getPoint());
+    }
+
     public String getCoord$() {
         if (this.getCoord() == null) {
             return "";

--
Gitblit v1.9.1