From 8bd6a3d7574f0ed50e52424d55a9767a0a3f03e4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 21 八月 2023 15:18:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java |   73 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 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 7169ca8..dcde899 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasShuttle;
 import com.zy.asrs.service.BasShuttleService;
 import com.zy.common.utils.NavigatePositionConvert;
 import com.zy.core.News;
@@ -55,6 +56,11 @@
      * 鐩爣搴撲綅
      */
     private String locNo;
+
+    /**
+     * 灏忚溅褰撳墠搴撲綅鍙�
+     */
+    private String currentLocNo;
 
     /**
      * 浣滀笟鏍囪
@@ -185,6 +191,13 @@
      * 闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃�(S)
      */
     private Integer errTime;
+
+    /**
+     * 鐙崰浠ょ墝
+     * 鏈浠诲姟鍗犳嵁锛屼护鐗屼负0
+     * 琚换鍔″崰鎹紝灏嗕换鍔″彿璧嬪�肩粰浠ょ墝
+     */
+    private Integer token = 0;
 
     //鎬婚噷绋嬫暟
     @Data
@@ -371,7 +384,7 @@
         if (this.getPoint() == null) {
             return "";
         }
-        return NavigatePositionConvert.xyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
+        return NavigatePositionConvert.nyXyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
     }
 
     public String getCoord$() {
@@ -381,10 +394,16 @@
         return JSON.toJSONString(this.getCoord());
     }
 
+    public void setPoint(NyShuttlePointClass point) {
+        String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
+        this.point = point;
+        this.currentLocNo = locNo;
+    }
+
     // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
     public Boolean isIdle() {
         boolean res = this.free == ShuttleStatusType.IDLE.id
-                && this.pakMk.equals(true)
+                && !this.pakMk
                 && this.errState == 0
                 && this.taskNo == 0
                 && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
@@ -409,7 +428,7 @@
     // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�侊紝浼犲叆鐨則askNo鍜屽綋鍓峵askNo鐩稿悓鏃跺厑璁告斁琛�
     public Boolean isIdle(int taskNo) {
         boolean res = this.free == ShuttleStatusType.IDLE.id
-                && this.pakMk.equals(true)
+                && !this.pakMk
                 && this.errState == 0
                 && (this.taskNo == 0 || this.taskNo == taskNo)
                 && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
@@ -428,4 +447,52 @@
         }
     }
 
+    // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+    public Boolean isIdleNoCharge() {
+        boolean res = this.free == ShuttleStatusType.IDLE.id
+                && !this.pakMk
+                && this.errState == 0
+                && this.taskNo == 0
+                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
+                ;
+        return res;
+    }
+
+    // 鏄惁婊¤冻鍏呯數鐘舵��
+    public Boolean isRequireCharge() {
+        if (this.free == null || this.pakMk == null || this.errState == null || this.taskNo == null) {
+            return false;
+        }
+
+        boolean res = this.free == ShuttleStatusType.IDLE.id
+                && !this.pakMk
+                && this.errState == 0
+                && this.taskNo == 0
+                && this.protocolStatusType.id == ShuttleProtocolStatusType.IDLE.id
+                ;
+        if (!res) {
+            return res;
+        } else {
+            // 鐢甸噺灏忎簬闃堝�兼垨鏈�浣庣數鑺數鍘嬪皬浜�2900mv锛岄渶瑕佽繘琛屽厖鐢�
+            try {
+                BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
+                if (shuttleService == null) {
+                    return false;
+
+                }
+                BasShuttle basShuttle = shuttleService.selectById(this.shuttleNo);
+                if (basShuttle == null) {
+                    return false;
+                }
+                Integer chargeLine = basShuttle.getChargeLine();
+                if (chargeLine == null) {
+                    return false;
+                }
+                return this.getPowerPercent() < chargeLine || this.minCellVoltage < 2900;
+            } catch (Exception e) {
+                News.error("fail", e);
+                return false;
+            }
+        }
+    }
 }

--
Gitblit v1.9.1