From 6fc533a424b5821d9e775d1ca89e00b8d16e57d4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 23 三月 2026 13:20:08 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 012acc7..a310e5c 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
@@ -5,6 +5,7 @@
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.constant.Constants;
import com.zy.acs.manager.common.domain.TaskDto;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
@@ -33,6 +34,14 @@
private LocService locService;
@Override
+ public Bus selectByBusNo(String busNo) {
+ if (Cools.isEmpty(busNo)) {
+ return null;
+ }
+ return this.getOne(new LambdaQueryWrapper<Bus>().eq(Bus::getBusNo, busNo).last(Constants.LIMIT_ONE));
+ }
+
+ @Override
public Bus selectByUuid(String uuid) {
return this.getOne(new LambdaQueryWrapper<Bus>().eq(Bus::getUuid, uuid));
}
@@ -41,7 +50,7 @@
if (Cools.isEmpty(param)) {
return;
}
- List<TaskDto> taskList = param.getTaskList();
+ List<TaskDto> taskList = param.getTasks();
if (Cools.isEmpty(taskList)) {
return;
}
@@ -49,7 +58,7 @@
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()));
+ .ge(Loc::getRowNo, 31).eq(Loc::getLocSts, LocStsType.IDLE.val()));
if (Cools.isEmpty(locList)) {
log.error("there is no such idle loc");
break;
@@ -75,7 +84,7 @@
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!";
}
--
Gitblit v1.9.1