From beb476733eaff1f3a76ec1be772337655803cccb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 十月 2024 10:53:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 fd096dd..59e06fd 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
@@ -11,6 +11,7 @@
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;
@@ -47,7 +48,7 @@
private SegmentService segmentService;
@Override
- public PageResult<Agv> pageRel(PageParam<Agv, BaseParam> pageParam) {
+ public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
}
@@ -80,6 +81,7 @@
i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
})
) > 0) {
+ log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 -segment......", agv.getUuid());
return false;
}
if (!this.judgeOnline(agv.getId())) {
@@ -110,7 +112,7 @@
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getPos() != 1) {
- log.warn("[{}]鍙稟gv璇风Щ鍔ㄥ埌瀹氫綅......", agv.getUuid());
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
return false;
}
}
@@ -142,4 +144,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