From 5a10e832b6b63a10ff7479789577a4100a440d5b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 28 四月 2026 15:31:17 +0800
Subject: [PATCH] 充电逻辑

---
 zy-acs-charge/src/main/java/com/zy/acs/charge/ChargeCoreService.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/zy-acs-charge/src/main/java/com/zy/acs/charge/ChargeCoreService.java b/zy-acs-charge/src/main/java/com/zy/acs/charge/ChargeCoreService.java
index 46528b2..71474a7 100644
--- a/zy-acs-charge/src/main/java/com/zy/acs/charge/ChargeCoreService.java
+++ b/zy-acs-charge/src/main/java/com/zy/acs/charge/ChargeCoreService.java
@@ -1,6 +1,6 @@
 package com.zy.acs.charge;
 
-import com.github.xingshuangs.iot.protocol.modbus.service.ModbusRtuOverTcp;
+import com.ghgande.j2mod.modbus.facade.ModbusTCPMaster;
 import com.zy.acs.charge.model.ChargerStatus;
 
 /**
@@ -14,7 +14,7 @@
      * @param client
      * @return
      */
-    boolean startCharging(ModbusRtuOverTcp client);
+    boolean startCharging(ModbusTCPMaster client);
 
     /**
      * 璋冨害鍋滄鍏呯數
@@ -22,7 +22,7 @@
      * @param client
      * @return
      */
-    boolean stopCharging(ModbusRtuOverTcp client);
+    boolean stopCharging(ModbusTCPMaster client);
 
     /**
      * 鍦ㄧ嚎姝g户鐢靛櫒鐘舵��(鍓嶈繘鍒颁綅)
@@ -30,7 +30,7 @@
      * @param client
      * @return
      */
-    boolean checkForwardRelayOnline(ModbusRtuOverTcp client);
+    boolean checkForwardRelayOnline(ModbusTCPMaster client);
 
 
     /**
@@ -39,7 +39,7 @@
      * @param client
      * @return
      */
-    boolean checkBackwardRelayOffline(ModbusRtuOverTcp client);
+    boolean checkBackwardRelayOffline(ModbusTCPMaster client);
 
     /**
      * 鑾峰彇鍏呯數鏈哄厖鐢电數鍘�
@@ -47,7 +47,7 @@
      * @param client
      * @return
      */
-    double getVoltage(ModbusRtuOverTcp client);
+    double getVoltage(ModbusTCPMaster client);
 
     /**
      * 鑾峰彇鍏呯數鏈哄厖鐢电數娴�
@@ -55,27 +55,27 @@
      * @param client
      * @return
      */
-    double getCurrent(ModbusRtuOverTcp client);
+    double getCurrent(ModbusTCPMaster client);
 
     /**
      * 鑾峰彇鍏呯數鏈哄厖鐢垫ā寮�
      * @param client
      * @return
      */
-    Short getChargeMode(ModbusRtuOverTcp client);
+    int getChargeMode(ModbusTCPMaster client);
 
     /**
      * 鑾峰彇鍏呯數鏈虹姸鎬�
      * @param client
      * @return
      */
-    ChargerStatus getStatus(ModbusRtuOverTcp client);
+    ChargerStatus getStatus(ModbusTCPMaster client);
 
 
-    boolean clearFault(ModbusRtuOverTcp client);
+    boolean clearFault(ModbusTCPMaster client);
 
-    boolean finishRetract(ModbusRtuOverTcp client);
+    boolean finishRetract(ModbusTCPMaster client);
 
-    boolean restoreStandby(ModbusRtuOverTcp client);
+    boolean restoreStandby(ModbusTCPMaster client);
 
 }

--
Gitblit v1.9.1