From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
index f481101..b5c2bf0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -5,6 +5,7 @@
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.CommonUtil;
+import com.zy.acs.manager.core.constant.AgvAreaDispatcher;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.FuncStaType;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -31,6 +32,8 @@
private AgvModelService agvModelService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private AgvAreaDispatcher agvAreaDispatcher;
@Override
public FuncSta getByCodeAndType(Long codeId, String type) {
@@ -60,7 +63,22 @@
return new ArrayList<>();
}
- Collections.shuffle(funcStaList);
+ // area limit
+ List<String> areaCodeList = agvAreaDispatcher.getAreaCodeListByAgvNo(agvService.getAgvNo(agvId));
+ if (Cools.isEmpty(areaCodeList)) {
+ funcStaList.clear();
+ } else {
+ funcStaList.removeIf(funcSta -> {
+ Code code = codeService.getCacheById(funcSta.getCode());
+ if (Cools.isEmpty(code, code.getData())) { return true; }
+ return !areaCodeList.contains(code.getData());
+ });
+ }
+
+ if (!Cools.isEmpty(funcStaList)) {
+ Collections.shuffle(funcStaList);
+ }
+
// filter idle
funcStaList = funcStaList.stream().filter(funcSta -> {
@@ -74,7 +92,7 @@
if (funcSta.getType().equals(FuncStaType.CHARGE.toString())) {
// if the type of this funSta is charge and the existing agv is in charge status, then that means this funSta is occupied
if (null != agv && !agv.getId().equals(agvId)) {
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getVol() < agvModel.getQuaBattery()) {
@@ -96,7 +114,7 @@
// if there is a running task whose destination is this funSta, then that means this funSta is occupied
if (0 < taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
+ .in(Task::getTaskType, TaskTypeType.TO_STANDBY.val(), TaskTypeType.TO_CHARGE.val())
.in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
.eq(Task::getDestCode, code)
)) {
@@ -110,7 +128,11 @@
if (null == agv) {
// if there is a running task whose destination is this funSta, then that means this funSta is occupied
if (0 < taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskTypeType.TO_STANDBY.val())
+ .in(Task::getTaskType
+ , TaskTypeType.TO_STANDBY.val()
+ , TaskTypeType.TO_CHARGE.val()
+ , TaskTypeType.MOVE.val()
+ )
.in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
.eq(Task::getDestCode, code)
)) {
@@ -142,7 +164,7 @@
}
if (null != codeId) {
- Code currCode = codeService.getById(codeId);
+ Code currCode = codeService.getCacheById(codeId);
Double[] startPos = new Double[]{currCode.getX(), currCode.getY()};
// checkout one funSta which is the closest
@@ -151,13 +173,44 @@
funcStaList.sort(new Comparator<FuncSta>() {
@Override
public int compare(FuncSta o1, FuncSta o2) {
- Code o1Code = codeService.getById(o1.getCode());
+ Code o1Code = codeService.getCacheById(o1.getCode());
int o1Distance = CommonUtil.calcDistance(startPos, new Double[]{o1Code.getX(), o1Code.getY()});
- Code o2Code = codeService.getById(o2.getCode());
+ Code o2Code = codeService.getCacheById(o2.getCode());
int o2Distance = CommonUtil.calcDistance(startPos, new Double[]{o2Code.getX(), o2Code.getY()});
return o1Distance - o2Distance;
+ }
+ });
+
+ }
+
+ return funcStaList.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public FuncSta checkoutFurthestFunSta(Long codeId, List<FuncSta> funcStaList) {
+ if (Cools.isEmpty(funcStaList)) {
+ return null;
+ }
+
+ if (null != codeId) {
+ Code currCode = codeService.getCacheById(codeId);
+ Double[] startPos = new Double[]{currCode.getX(), currCode.getY()};
+
+ // checkout one funSta which is the closest
+
+ // compare => compare杩斿洖璐熸暟锛屽垯鎺掑湪闆嗗悎鍓嶉潰 锛坅sc锛�
+ funcStaList.sort(new Comparator<FuncSta>() {
+ @Override
+ public int compare(FuncSta o1, FuncSta o2) {
+ Code o1Code = codeService.getCacheById(o1.getCode());
+ int o1Distance = CommonUtil.calcDistance(startPos, new Double[]{o1Code.getX(), o1Code.getY()});
+
+ Code o2Code = codeService.getCacheById(o2.getCode());
+ int o2Distance = CommonUtil.calcDistance(startPos, new Double[]{o2Code.getX(), o2Code.getY()});
+
+ return o2Distance - o1Distance;
}
});
@@ -185,7 +238,7 @@
agv = agvService.findByPosition(funcSta.getCode());
if (null != agv) {
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
return false;
--
Gitblit v1.9.1