From 2a013c461300865aa6792b071ab87ade416439dd Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 4 Jul 2024 11:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=85=E7=94=B5=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nlsso-server/src/main/java/org/nl/acs/AcsConfig.java      | 2 ++
 .../basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java          | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java
index 965a76a..f9ba028 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java
@@ -58,4 +58,6 @@ public interface AcsConfig {
      * 日志级别
      */
     String LOGLEVEL = "log_level";
+
+    String ELECTRIC ="electric";
 }
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index 3395d42..843993f 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun;
 import org.nl.acs.device.domain.Device;
@@ -326,7 +327,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
         } else if (phase == 0x73) {
             //agv电量
             electric_qty = ikey;
-            if (electric_qty < 40 && !isCharge) {
+            int electric = Integer.parseInt(paramService.findByCode(AcsConfig.ELECTRIC).getValue());
+            if (electric_qty < electric && !isCharge) {
                 log.info("当前车辆{}电量为{}低于40，开始充电!", this.device_code, electric_qty);
                 NDCAgvService.charge(this.device_code);
                 isCharge =true;