From d32dae7ffed5e215ac092f29a458e0c8bde2008b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十月 2024 15:57:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 bf4fd1e..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
@@ -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;
@@ -44,6 +48,11 @@
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) {
return this.getOne(new LambdaQueryWrapper<Agv>().eq(Agv::getUuid, uuid));
}
@@ -72,6 +81,7 @@
i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
})
) > 0) {
+ log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 -segment......", agv.getUuid());
return false;
}
if (!this.judgeOnline(agv.getId())) {
@@ -102,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;
}
}
@@ -134,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