From e5950739d6df283c02fe3160b8b8f739a902f415 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 30 四月 2026 10:09:00 +0800
Subject: [PATCH] 充电机代码提交
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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..15d706f 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;
@@ -343,18 +343,18 @@
@Override
public Boolean judgeAutoStopCharge(AgvModel agvModel, AgvDetail agvDetail, Agv agv ) {
if (redis.getMap(RedisConstant.AGV_CHARGE_FLAG, agv.getUuid()) != null){
- return false;
+ return true;
}
// 鎵嬪姩鍏呯數妯″紡锛岃烦杩�
- if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
- FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
- ModbusRtuOverTcp modbusTcp = chargeService.get(funcSta.getUuid());
- // 鎵嬪姩鍏呯數妯″紡,璺宠繃
- if (chargeCoreService.getChargeMode(modbusTcp) != 1) {
- return false;
- }
- }
- return true;
+// if (agvModel.getNeedUndocking() != null && agvModel.getNeedUndockingBool()) {
+// FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
+// ModbusTCPMaster modbusTCPMaster = chargeService.get(funcSta.getUuid());
+// // 鎵嬪姩鍏呯數妯″紡,璺宠繃
+// if (modbusTCPMaster != null && chargeCoreService.getChargeMode(modbusTCPMaster) == 1) {
+// return true;
+// }
+// }
+ return false;
}
}
--
Gitblit v1.9.1