From 86620f192814851deb88c1a1bc78ba8555966cda Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 03 一月 2025 15:34:16 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 fad3e00..ee09499 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,6 +21,11 @@ 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)); } @@ -37,8 +42,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 @@ -54,7 +69,11 @@ if (null == agvModel) { agvModel = agvModelService.getById(agv.getAgvModel()); } - return agvDetail.getVol() < Math.min(agv.getChargeLine(), 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