From 800418710e803ef898f7f364ba9d6293cc3a4967 Mon Sep 17 00:00:00 2001 From: vincentlu <t1341870251@gmail.com> Date: 星期一, 20 一月 2025 16:19:36 +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 fbb348a..dce8c0c 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,8 @@ private AgvService agvService; @Autowired private AgvModelService agvModelService; + @Autowired + private CodeService codeService; @Override public AgvDetail selectMajorByAgvId(Long agvId) { @@ -63,7 +67,7 @@ @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.getByAgvId(agv.getId()); @@ -75,4 +79,14 @@ } } + @Override + public Code getCurrentCode(Long agvId) { + AgvDetail agvDetail = this.selectMajorByAgvId(agvId); + Long recentCode = agvDetail.getRecentCode(); + if (null == recentCode) { + return null; + } + return codeService.getById(recentCode); + } + } -- Gitblit v1.9.1