From b6c82c2a4b94e63d1afe506a7b943496cc9f8017 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 一月 2025 09:20:20 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 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 844be39..d30882b 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,9 +11,11 @@
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.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.Segment;
import com.zy.acs.manager.manager.enums.SegmentStateType;
-import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.mapper.AgvMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
@@ -21,8 +23,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 瀛楀吀鏁版嵁Service瀹炵幇
@@ -36,6 +41,10 @@
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+ private static final Map<String, Long> AGV_ID_MAP = new HashMap<>();
+
+ private static final Map<Long, String> AGV_NO_MAP = new HashMap<>();
+
@Autowired
private AgvDetailService agvDetailService;
@Autowired
@@ -46,6 +55,16 @@
private CodeService codeService;
@Autowired
private SegmentService segmentService;
+ @Autowired
+ private TaskService taskService;
+
+ @PostConstruct
+ public void init() {
+ for (Agv agv : this.list()) {
+ AGV_ID_MAP.put(agv.getUuid(), agv.getId());
+ AGV_NO_MAP.put(agv.getId(), agv.getUuid());
+ }
+ }
@Override
public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
@@ -58,12 +77,21 @@
}
@Override
- public Agv queryIdle(Task task) {
- if (Cools.isEmpty(task)) {
+ public Long getAgvId(String uuid) {
+ if (Cools.isEmpty(uuid)) {
return null;
}
- return null;
+ return AGV_ID_MAP.get(uuid);
}
+
+ @Override
+ public String getAgvNo(Long agvId) {
+ if (Cools.isEmpty(agvId)) {
+ return null;
+ }
+ return AGV_NO_MAP.get(agvId);
+ }
+
@Override
public Boolean judgeEnable(Long agvId) {
@@ -71,24 +99,21 @@
}
@Override
- public Boolean judgeEnable(Long agvId, Boolean withBattery) {
+ public Boolean judgeEnable(Long agvId, Boolean isLowBattery) {
Agv agv = this.getById(agvId);
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- if (segmentService.count(new LambdaQueryWrapper<Segment>()
+ if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
- .and( i -> {
-// i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
- i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
- })
- ) > 0) {
- log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 -segment......", agv.getUuid());
+ .eq(Segment::getState, SegmentStateType.RUNNING.toString())
+ )) {
+ log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agv.getUuid());
return false;
}
if (!this.judgeOnline(agv.getId())) {
log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agv.getUuid());
return false;
}
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agv.getId());
if (null == agvDetail) {
log.warn("[{}]鍙稟gv鏈敹鍒扮姸鎬佸寘......", agv.getUuid());
return false;
@@ -101,7 +126,7 @@
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() <= agvModel.getQuaBattery()) {
+ if (agvDetail.getVol() < agvModel.getQuaBattery()) {
return false;
}
}
@@ -110,14 +135,14 @@
log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
return false;
}
- }
- // with battery
- if (withBattery) {
- if (agvDetail.getVol() < agv.getChargeLine()) {
- log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
+ if (null == agvDetail.getRecentCode()) {
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
return false;
}
- if (agvDetail.getVol() < agvModel.getLowBattery()) {
+ }
+ // with battery
+ if (isLowBattery) {
+ if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
return false;
}
@@ -153,9 +178,9 @@
@Override
public Integer getBackpack(Agv agv) {
- if (null != agv.getStage()) {
- return agv.getStage();
- }
+// if (null != agv.getStage()) {
+// return agv.getStage();
+// }
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
assert null != agvModel;
return agvModel.getBackpack();
@@ -163,12 +188,17 @@
@Override
public Agv findByPosition(Long codeId) {
- List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>()
+// .eq(Agv::getStatus, StatusType.ENABLE.val)
+ );
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) {
continue;
}
+ if (null == agvDetail.getRecentCode()) {
+ continue;
+ }
if (agvDetail.getRecentCode().equals(codeId)) {
return agv;
}
--
Gitblit v1.9.1