From fd6d26f8ffe6a37533e741337f3eca9134d934c7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 一月 2025 10:42:59 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
index 279d972..fbb348a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java
@@ -21,14 +21,18 @@
private AgvModelService agvModelService;
@Override
+ public AgvDetail selectMajorByAgvId(Long agvId) {
+ return this.baseMapper.selectMajorByAgvId(agvId);
+ }
+
+ @Override
public AgvDetail selectByAgvId(Long agvId) {
return this.getOne(new LambdaQueryWrapper<AgvDetail>().eq(AgvDetail::getAgvId, agvId));
}
@Override
public AgvDetail selectByAgvNo(String agvNo) {
- Agv agv = agvService.selectByUuid(agvNo);
- return this.selectByAgvId(agv.getId());
+ return this.selectByAgvId(agvService.getAgvId(agvNo));
}
@Override
@@ -37,8 +41,18 @@
}
@Override
+ public Boolean updatePosCodeByAgvId(Long agvId, Long codeId) {
+ return this.baseMapper.updatePosCodeByAgvId(agvId, codeId) > 0;
+ }
+
+ @Override
public Boolean updateUnPosCode(Long id, Long codeId) {
return this.baseMapper.updateUnPosCode(id, codeId) > 0;
+ }
+
+ @Override
+ public Boolean updateAngleByAgvId(Long agvId, Double angle) {
+ return this.baseMapper.updateAngleByAgvId(agvId, angle);
}
@Override
@@ -52,9 +66,13 @@
agvDetail = this.selectByAgvId(agv.getId());
}
if (null == agvModel) {
- agvModel = agvModelService.getById(agv.getAgvModel());
+ agvModel = agvModelService.getByAgvId(agv.getId());
}
- return agvDetail.getVol() < agv.getChargeLine() || agvDetail.getVol() < agvModel.getLowBattery();
+ if (null == agv.getChargeLine()) {
+ return agvDetail.getVol() < agvModel.getLowBattery();
+ } else {
+ return agvDetail.getVol() < Math.max(agv.getChargeLine(), agvModel.getLowBattery());
+ }
}
}
--
Gitblit v1.9.1