From f51029f35beb182ed442e9d211fc39112ed6a5c0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 17:01:19 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvDetailServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 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 816efbd..e432eec 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
@@ -5,10 +5,12 @@
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.AgvModel;
+import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.mapper.AgvDetailMapper;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.AgvService;
+import com.zy.acs.manager.manager.service.CodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,6 +21,13 @@
private AgvService agvService;
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private CodeService codeService;
+
+ @Override
+ public AgvDetail selectMajorByAgvId(Long agvId) {
+ return this.baseMapper.selectMajorByAgvId(agvId);
+ }
@Override
public AgvDetail selectByAgvId(Long agvId) {
@@ -27,8 +36,7 @@
@Override
public AgvDetail selectByAgvNo(String agvNo) {
- Agv agv = agvService.selectByUuid(agvNo);
- return this.selectByAgvId(agv.getId());
+ return this.selectByAgvId(agvService.getAgvId(agvNo));
}
@Override
@@ -59,10 +67,10 @@
@Override
public Boolean isPowerLoss(Agv agv, AgvDetail agvDetail, AgvModel agvModel) {
if (null == agvDetail) {
- agvDetail = this.selectByAgvId(agv.getId());
+ agvDetail = this.selectMajorByAgvId(agv.getId());
}
if (null == agvModel) {
- agvModel = agvModelService.getById(agv.getAgvModel());
+ agvModel = agvModelService.getByAgvId(agv.getId());
}
if (null == agv.getChargeLine()) {
return agvDetail.getVol() < agvModel.getLowBattery();
@@ -71,4 +79,17 @@
}
}
+ @Override
+ public Code getCurrentCode(Long agvId) {
+ AgvDetail agvDetail = this.selectMajorByAgvId(agvId);
+ if (null == agvDetail) {
+ return null;
+ }
+ Long recentCode = agvDetail.getRecentCode();
+ if (null == recentCode) {
+ return null;
+ }
+ return codeService.getCacheById(recentCode);
+ }
+
}
--
Gitblit v1.9.1