From 6f1a96c44b273f3dee28260715c16d408d79d38f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 27 九月 2024 10:47:36 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.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/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java index bf4fd1e..e710b8e 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 @@ -6,13 +6,17 @@ import com.zy.acs.common.enums.AgvStatusType; import com.zy.acs.common.utils.JudgeSupport; import com.zy.acs.common.utils.RedisSupport; +import com.zy.acs.framework.common.Cools; +import com.zy.acs.manager.common.domain.BaseParam; +import com.zy.acs.manager.common.domain.PageParam; +import com.zy.acs.manager.common.domain.PageResult; import com.zy.acs.manager.core.domain.VehicleDto; +import com.zy.acs.manager.manager.controller.result.AgvResult; import com.zy.acs.manager.manager.entity.*; import com.zy.acs.manager.manager.enums.SegmentStateType; import com.zy.acs.manager.manager.mapper.AgvMapper; import com.zy.acs.manager.manager.service.*; import com.zy.acs.manager.system.service.ConfigService; -import com.zy.acs.framework.common.Cools; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +46,11 @@ private CodeService codeService; @Autowired private SegmentService segmentService; + + @Override + public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) { + return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal()); + } @Override public Agv selectByUuid(String uuid) { @@ -134,4 +143,14 @@ return res; } + @Override + public Integer getBackpack(Agv agv) { + if (null != agv.getStage()) { + return agv.getStage(); + } + AgvModel agvModel = agvModelService.getById(agv.getAgvModel()); + assert null != agvModel; + return agvModel.getBackpack(); + } + } -- Gitblit v1.9.1