From ecf4bac4ae2742a44d4b7df95d3ba63fbe82cc49 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 4 Jul 2024 14:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/agv/server/impl/NDCAgvServiceImpl.java   | 13 +++++++++++++
 .../agv/ndcone/AgvNdcOneDeviceDriver.java           |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 0bfd0a7..c2d61a6 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -200,9 +200,17 @@ public class NDCAgvServiceImpl implements NDCAgvService {
         //分配车辆
         List<Dict> dictList= dictService.getDictByName("station");
         int satation=0;
+        Dict temp=new Dict();
+        for(Dict dict : dictList){
+            if ("1".equals(dict.getValue())&&carno.equals(dict.getPara2())){
+                log.info("当前车辆{}已分配充电桩{}，退出后续判断",carno,dict.getPara1());
+                return;
+            }
+        }
         for(Dict dict : dictList){
             if ("0".equals(dict.getValue())){
                 satation = Integer.parseInt(dict.getPara1());
+                temp=dict;
                 break;
             }
         }
@@ -242,6 +250,11 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             } catch (Exception e){
                 log.error("下发充电任务失败{}{}",e,e.getMessage());
             }
+
+            temp.setValue("1");
+            temp.setPara2(String.valueOf(carno));
+            dictService.updateDetail(temp);
+
         }else{
             log.error("目前暂无可使用充电桩充电桩，暂不分配{}充电任务",carno);
         }
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 843993f..8d28718 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
@@ -328,8 +328,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //agv电量
             electric_qty = ikey;
             int electric = Integer.parseInt(paramService.findByCode(AcsConfig.ELECTRIC).getValue());
-            if (electric_qty < electric && !isCharge) {
-                log.info("当前车辆{}电量为{}低于40，开始充电!", this.device_code, electric_qty);
+            if (electric_qty < electric) {
+                log.info("当前车辆{}电量为{}低于{}，开始判断是否需要充电!", this.device_code, electric_qty,electric);
                 NDCAgvService.charge(this.device_code);
                 isCharge =true;
             }