From 788c049b641607b4288f76b57dd73230bf882177 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 21 一月 2026 16:16:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 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 9c324c2..2bf91fd 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
@@ -3,22 +3,25 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.BaseRes;
+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.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.framework.common.Cools;
+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;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Slf4j
@Service("busService")
@@ -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.getTaskList();
+ 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)) {
+ break;
+ }
+ log.error("there is no such idle loc");
+ Collections.shuffle(locList);
+ Loc loc = locList.get(0);
+ dto.setDestLoc(loc.getLocNo());
+ }
+ }
+ }
}
@Override
@@ -40,6 +70,7 @@
if (Cools.isEmpty(param.getBatch())) {
return "Batch cannot be empty!";
}
+ this.test(param);
Set<String> oriStaNoSet = new HashSet<>();
Set<String> oriLocNoSet = new HashSet<>();
Set<String> destStaNoSet = new HashSet<>();
@@ -47,6 +78,9 @@
for (TaskDto dto : param.getTaskList()) {
if (!Cools.isEmpty(dto.getOriSta()) && !Cools.isEmpty(dto.getOriLoc())) {
return "OriSta and OriLoc cannot exist at the same time!";
+ }
+ if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) {
+ return "OriSta and OriLoc must have one!";
}
if (!Cools.isEmpty(dto.getOriSta())) {
if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
@@ -66,6 +100,9 @@
if (!Cools.isEmpty(dto.getDestSta()) && !Cools.isEmpty(dto.getDestLoc())) {
return "DestSta and DestLoc cannot exist at the same time!";
+ }
+ if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
+ return "DestSta and DestLoc must have one!";
}
if (!Cools.isEmpty(dto.getDestSta())) {
if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) {
@@ -114,4 +151,32 @@
return this.list(wrapper);
}
+ @Override
+ public void checkoutComplete(Long busId) {
+ if (null == busId) {
+ return;
+ }
+ int taskTotalCount = taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getBusId, busId));
+ List<Task> actualDoneTasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBusId, busId)
+ .in(Task::getTaskSts
+ , TaskStsType.COMPLETE.val()
+ , TaskStsType.CANCEL.val()
+ )
+ );
+ if (taskTotalCount == actualDoneTasks.size()) {
+ Bus bus = this.getById(busId);
+ long cancelTasksCount = actualDoneTasks.stream().filter(task -> TaskStsType.CANCEL.val() == task.getTaskSts()).count();
+ if (cancelTasksCount == taskTotalCount) {
+ bus.setBusSts(BusStsType.CANCEL.val());
+ } else {
+ bus.setBusSts(BusStsType.FINISH.val());
+ }
+ bus.setUpdateTime(new Date());
+ if (!this.updateById(bus)) {
+ throw new CoolException("Bus[{" + busId + "}] failed to update");
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1