From 8f1c5854c90f2f18bdce3f421a8bd20b410f34e1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 22 四月 2026 09:17:13 +0800
Subject: [PATCH] 充电逻辑补充,充电桩分为手动充电和自动充电,手动充电模式下也不可以发任务给小车;协议补充0x71和0x72

---
 zy-acs-charge/src/main/java/com/zy/acs/charge/impl/AiPowerChargeServiceImpl.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/zy-acs-charge/src/main/java/com/zy/acs/charge/impl/AiPowerChargeServiceImpl.java b/zy-acs-charge/src/main/java/com/zy/acs/charge/impl/AiPowerChargeServiceImpl.java
index 7c6c445..21de744 100644
--- a/zy-acs-charge/src/main/java/com/zy/acs/charge/impl/AiPowerChargeServiceImpl.java
+++ b/zy-acs-charge/src/main/java/com/zy/acs/charge/impl/AiPowerChargeServiceImpl.java
@@ -20,7 +20,11 @@
 @Slf4j
 public class AiPowerChargeServiceImpl implements ChargeCoreService {
 
-
+    /**
+     * 寮�濮嬪厖鐢�
+     * @param client
+     * @return
+     */
     @Override
     public boolean startCharging(ModbusRtuOverTcp client) {
         // AGV杞︽姤鍛婂埌浣� -> true
@@ -28,32 +32,71 @@
         return true;
     }
 
+    /**
+     * 鍋滄鍏呯數
+     * @param client
+     * @return
+     */
     @Override
     public boolean stopCharging(ModbusRtuOverTcp client) {
         client.writeCoil(AiPowerChargerCoilEnum.AGV_REPORTED_IN_POSITION.getAddr(), false);
         return true;
     }
 
+    /**
+     * 鍦ㄧ嚎姝g户鐢靛櫒鐘舵��(鍓嶈繘鍒颁綅)
+     * @param client
+     * @return
+     */
     @Override
     public boolean checkForwardRelayOnline(ModbusRtuOverTcp client) {
         return client.readBoolean(AiPowerChargerCoilEnum.FORWARD_RELAY_ONLINE.getAddr(), 1);
     }
 
+    /**
+     * 绂荤嚎姝g户鐢靛櫒鐘舵��(鍚庨��鍒颁綅)
+     * @param client
+     * @return
+     */
     @Override
     public boolean checkBackwardRelayOffline(ModbusRtuOverTcp client) {
         return client.readBoolean(AiPowerChargerCoilEnum.BACKWARD_RELAY_OFFLINE.getAddr(), 1);
     }
 
+    /**
+     * 鑾峰彇鍏呯數鏈哄厖鐢电數鍘�
+     * @param client
+     * @return
+     */
     @Override
     public double getVoltage(ModbusRtuOverTcp client) {
         return client.readInt16(AiPowerChargerRegisterEnum.CHARGE_VOLTAGE.getAddr(), 1) * AiPowerChargerRegisterEnum.CHARGE_CURRENT.getRaw();
     }
-
+    /**
+     * 鑾峰彇鍏呯數鏈哄厖鐢电數娴�
+     * @param client
+     * @return
+     */
     @Override
     public double getCurrent(ModbusRtuOverTcp client) {
         return client.readInt16(AiPowerChargerRegisterEnum.CHARGE_CURRENT.getAddr(), 1) * AiPowerChargerRegisterEnum.CHARGE_CURRENT.getRaw();
     }
 
+    /**
+     * 鑾峰彇鍏呯數鏈哄厖鐢垫ā寮�
+     * @param client
+     * @return
+     */
+    @Override
+    public Short getChargeMode(ModbusRtuOverTcp client) {
+        return client.readInt16(AiPowerChargerRegisterEnum.CHARGE_MODE.getAddr(), 1);
+    }
+
+    /**
+     * 鑾峰彇鍏呯數鏈虹姸鎬�
+     * @param client
+     * @return
+     */
     @Override
     public ChargerStatus getStatus(ModbusRtuOverTcp client) {
         ChargerStatus status = new ChargerStatus();
@@ -101,21 +144,33 @@
     }
 
 
-    // 娓呴櫎鏁呴殰
+    /**
+     * 娓呴櫎鏁呴殰
+     * @param client
+     * @return
+     */
     @Override
     public boolean clearFault(ModbusRtuOverTcp client) {
         client.writeInt16(AiPowerChargerRegisterEnum.SCHEDULE_FLAG.getAddr(), (short) 1);
         return true;
     }
 
-    // 瀹屾垚閫�鍥炲懡浠�
+    /**
+     * 瀹屾垚閫�鍥�
+     * @param client
+     * @return
+     */
     @Override
     public boolean finishRetract(ModbusRtuOverTcp client) {
         client.writeInt16(AiPowerChargerRegisterEnum.SCHEDULE_FLAG.getAddr(), (short) 2);
         return true;
     }
 
-    // 鎭㈠寰呮満鐘舵��
+    /**
+     * 鎭㈠寰呮満
+     * @param client
+     * @return
+     */
     @Override
     public boolean restoreStandby(ModbusRtuOverTcp client) {
         client.writeInt16(AiPowerChargerRegisterEnum.SCHEDULE_FLAG.getAddr(), (short) 3);

--
Gitblit v1.9.1