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/AgvServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 d30882b..b9d13d7 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
@@ -100,29 +100,29 @@
@Override
public Boolean judgeEnable(Long agvId, Boolean isLowBattery) {
- Agv agv = this.getById(agvId);
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ String agvNo = this.getAgvNo(agvId);
+ AgvModel agvModel = agvModelService.getByAgvId(agvId);
if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
.eq(Segment::getState, SegmentStateType.RUNNING.toString())
)) {
- log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agv.getUuid());
+ log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agvNo);
return false;
}
- if (!this.judgeOnline(agv.getId())) {
- log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agv.getUuid());
+ if (!this.judgeOnline(agvId)) {
+ log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agvNo);
return false;
}
- AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agv.getId());
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
if (null == agvDetail) {
- log.warn("[{}]鍙稟gv鏈敹鍒扮姸鎬佸寘......", agv.getUuid());
+ log.warn("[{}]鍙稟gv鏈敹鍒扮姸鎬佸寘......", agvNo);
return false;
}
if (agvDetail.getVol() == 0) {
return false;
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.IDLE) && !agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- log.warn("[{}]鍙稟gv涓嶆槸绌洪棽鐘舵��......", agv.getUuid());
+ log.warn("[{}]鍙稟gv涓嶆槸绌洪棽鐘舵��......", agvNo);
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -132,18 +132,19 @@
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getPos() != 1) {
- log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agvNo);
return false;
}
if (null == agvDetail.getRecentCode()) {
- log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agvNo);
return false;
}
}
// with battery
if (isLowBattery) {
+ Agv agv = this.getById(agvId);
if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
- log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
+ log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agvNo);
return false;
}
}
@@ -170,7 +171,7 @@
AgvDetail detail = agvDetailService.selectByAgvId(agv.getId());
VehicleDto dto = new VehicleDto();
dto.setVehicle(agv.getUuid());
- dto.setPosCode(codeService.getById(detail.getRecentCode()).getData());
+ dto.setPosCode(codeService.getCacheById(detail.getRecentCode()).getData());
res.add(dto);
}
return res;
@@ -181,7 +182,7 @@
// if (null != agv.getStage()) {
// return agv.getStage();
// }
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
assert null != agvModel;
return agvModel.getBackpack();
}
--
Gitblit v1.9.1