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-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 64ede33..bf630fe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.xingshuangs.iot.protocol.modbus.service.ModbusRtuOverTcp;
+import com.ghgande.j2mod.modbus.facade.ModbusTCPMaster;
import com.zy.acs.charge.ChargeCoreService;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.enums.AgvStatusType;
@@ -348,10 +348,10 @@
// 鎵嬪姩鍏呯數妯″紡锛岃烦杩�
if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
- ModbusRtuOverTcp modbusTcp = chargeService.get(funcSta.getUuid());
+ ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
// 鎵嬪姩鍏呯數妯″紡,璺宠繃
- if (chargeCoreService.getChargeMode(modbusTcp) != 1) {
- return false;
+ if (chargeCoreService.getChargeMode(modbusTCPMaster) != 1) {
+ return false;
}
}
return true;
--
Gitblit v1.9.1