From 74c4a8c520d01c0cb648191d0d59be38e946f8ef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 十二月 2024 15:09:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 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..816efbd 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
@@ -37,8 +37,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 +64,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