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-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index 71cb1f4..d727e99 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -132,8 +132,8 @@
// if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
// continue;
// }
- // 瀛樺湪鍏呯數鏍囪锛岃烦杩�
- if (redis.getMap(RedisConstant.AGV_CHARGE_FLAG, agv.getUuid()) != null) {
+ // 鍒よ鏄惁鍙互鑷姩鏂紑鍏呯數锛堝嵆鍏呯數杩囩▼涓笉鑳芥帴鍙椾换鍔★級锛岃烦杩�
+ if (!agvService.judgeAutoStopCharge(agvModel,agvDetail, agv)) {
continue;
}
// is charging ?
@@ -260,6 +260,9 @@
continue;
}
AgvDetail agvDetail = agvDetailService.selectByAgvNo(key);
+ if (agvDetail.getCode() == null) {
+ continue;
+ }
FuncSta funcSta = funcStaService.getByCodeAndType(agvDetail.getCode(), FuncStaType.CHARGE.toString());
ModbusRtuOverTcp modbusTcp = chargeService.get(funcSta.getUuid());
if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus() || funcSta == null || null == modbusTcp) {
--
Gitblit v1.9.1