From 0267cc2886bbdce2c9a55755789c10e0dcaff9f0 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 14:46:24 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 0d12a98..6b49886 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,8 +5,9 @@
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.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;
@@ -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;
}
@@ -67,7 +76,7 @@
if (null == param) {
return BaseRes.PARAM;
}
- if (Cools.isEmpty(param.getBatch())) {
+ if (Cools.isEmpty(param.getBatchNo())) {
return "Batch cannot be empty!";
}
this.test(param);
@@ -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!";
}
@@ -119,8 +128,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