From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 591f875..c667477 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
@@ -10,15 +10,22 @@
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.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;
@Slf4j
@Service("busService")
public class BusServiceImpl extends ServiceImpl<BusMapper, Bus> implements BusService {
+
+ @Autowired
+ private TaskService taskService;
@Override
public Bus selectByUuid(String uuid) {
@@ -33,24 +40,57 @@
if (Cools.isEmpty(param.getBatch())) {
return "Batch cannot be empty!";
}
+ 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()) {
+ 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.getOriLoc())) {
- return "OriSta and OriLoc cannot exist at the same time!";
- }
if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
return "Destination cannot be empty!";
}
}
-
- if (!Cools.isEmpty(dto.getDestSta())) {
- if (!Cools.isEmpty(dto.getDestLoc())) {
- return "DestSta and DestLoc cannot exist at the same time!";
+ if (!Cools.isEmpty(dto.getOriLoc())) {
+ if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
+ return "Destination cannot be empty!";
}
+ if (oriLocNoSet.contains(dto.getOriLoc())) {
+ return "OriLoc cannot be repeated";
+ } else {
+ oriLocNoSet.add(dto.getOriLoc());
+ }
+ }
+
+ 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())) {
return "Origin cannot be empty!";
}
}
+ if (!Cools.isEmpty(dto.getDestLoc())) {
+ if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) {
+ return "Origin cannot be empty!";
+ }
+ if (destLocNoSet.contains(dto.getDestLoc())) {
+ return "DestLoc cannot be repeated";
+ } else {
+ destLocNoSet.add(dto.getDestLoc());
+ }
+ }
+ if (Cools.isEmpty(dto.getSeqNum())) {
+ dto.setSeqNum(taskService.generateSeqNum());
+ }
}
return null;
--
Gitblit v1.9.1