From 067ea036e9044d8e57d0d1abaddd66f13f745e6a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 12:54:54 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
index 21e8ad2..a9586c0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -6,13 +6,16 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.domain.TaskDto;
-import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
+import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
+import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.BusStsType;
+import com.zy.acs.manager.manager.enums.LocStsType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.BusMapper;
import com.zy.acs.manager.manager.service.BusService;
+import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +29,37 @@
@Autowired
private TaskService taskService;
+ @Autowired
+ private LocService locService;
@Override
public Bus selectByUuid(String uuid) {
return this.getOne(new LambdaQueryWrapper<Bus>().eq(Bus::getUuid, uuid));
+ }
+
+ private void test(OpenBusSubmitParam param) {
+ if (Cools.isEmpty(param)) {
+ return;
+ }
+ List<TaskDto> taskList = param.getTasks();
+ if (Cools.isEmpty(taskList)) {
+ return;
+ }
+ for (TaskDto dto : taskList) {
+ if (dto.getPriority() == 9527) {
+ if (Cools.isEmpty(dto.getDestLoc())) {
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .ge(Loc::getRow, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
+ if (Cools.isEmpty(locList)) {
+ log.error("there is no such idle loc");
+ break;
+ }
+ Collections.shuffle(locList);
+ Loc loc = locList.get(0);
+ dto.setDestLoc(loc.getLocNo());
+ }
+ }
+ }
}
@Override
@@ -37,14 +67,15 @@
if (null == param) {
return BaseRes.PARAM;
}
- if (Cools.isEmpty(param.getBatch())) {
+ if (Cools.isEmpty(param.getBatchNo())) {
return "Batch cannot be empty!";
}
+ this.test(param);
Set<String> oriStaNoSet = new HashSet<>();
Set<String> oriLocNoSet = new HashSet<>();
Set<String> destStaNoSet = new HashSet<>();
Set<String> destLocNoSet = new HashSet<>();
- for (TaskDto dto : param.getTaskList()) {
+ for (TaskDto dto : param.getTasks()) {
if (!Cools.isEmpty(dto.getOriSta()) && !Cools.isEmpty(dto.getOriLoc())) {
return "OriSta and OriLoc cannot exist at the same time!";
}
@@ -88,8 +119,8 @@
destLocNoSet.add(dto.getDestLoc());
}
}
- if (Cools.isEmpty(dto.getSeqNum())) {
- dto.setSeqNum(taskService.generateSeqNum());
+ if (Cools.isEmpty(dto.getTaskNo())) {
+ dto.setTaskNo(taskService.generateSeqNum());
}
}
--
Gitblit v1.9.1