From 69e1880e5486ebc62da4806642ca817afda9c84c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 14:09:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 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 a8f7fa4..ac78e39 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -204,6 +204,46 @@
      */
     private Integer token = 0;
 
+    /**
+     * 璺戝簱鐘舵��
+     */
+    private Boolean moveLoc = false;
+
+    /**
+     * 璺戝簱绫诲瀷锛�0:璺戣建閬擄紝1锛氳窇搴撲綅
+     */
+    private Integer moveType = 0;
+
+    /**
+     * 璺戝簱X璧风偣
+     */
+    private Integer xStart = 0;
+
+    /**
+     * 璺戝簱X缁堢偣
+     */
+    private Integer xTarget = 0;
+
+    /**
+     * 璺戝簱X褰撳墠鐐逛綅
+     */
+    private Integer xCurrent = 0;
+
+    /**
+     * 璺戝簱Y璧风偣
+     */
+    private Integer yStart = 0;
+
+    /**
+     * 璺戝簱Y缁堢偣
+     */
+    private Integer yTarget = 0;
+
+    /**
+     * 璺戝簱Y褰撳墠鐐逛綅
+     */
+    private Integer yCurrent = 0;
+
     //鎬婚噷绋嬫暟
     @Data
     public static class StatusSumClass {
@@ -535,7 +575,7 @@
                 if (chargeLine == null) {
                     return false;
                 }
-                return this.getPowerPercent() < chargeLine || this.minCellVoltage < 2900;
+                return this.getPowerPercent() < chargeLine;
             } catch (Exception e) {
                 News.error("fail", e);
                 return false;

--
Gitblit v1.9.1