From 25374823223e1b881a773f253ff12ec76a967da3 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 15 一月 2026 13:49:24 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 9666287..1f0ed1e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -6,12 +6,13 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.common.exception.BusinessException;
-import com.zy.acs.manager.core.domain.Lane;
-import com.zy.acs.manager.core.service.LaneService;
+import com.zy.acs.manager.core.domain.LaneDto;
+import com.zy.acs.manager.core.service.LaneBuilder;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.mapper.TaskMapper;
@@ -40,9 +41,15 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private LaneService laneService;
+ private LaneBuilder laneBuilder;
@Autowired
private StaReserveService staReserveService;
+ @Autowired
+ private SegmentService segmentService;
+ @Autowired
+ private ActionService actionService;
+ @Autowired
+ private TravelService travelService;
@Override
public PageResult<Task> pageRel(PageParam<Task, BaseParam> pageParam) {
@@ -98,15 +105,37 @@
if (null == task) {
return Boolean.FALSE;
}
+ Date now = new Date();
+ // stock
this.maintainLocAndStaHandler(task, Boolean.TRUE);
-
+ // task
task.setTaskSts(TaskStsType.COMPLETE.val());
- task.setUpdateTime(new Date());
+ task.setUpdateTime(now);
task.setUpdateBy(userId);
+ task.setMemo(Constants.HANDLE + " " + TaskStsType.COMPLETE);
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ // bus
busService.checkoutComplete(task.getBusId());
+ // segment
+ List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTaskId, taskId));
+ if (!Cools.isEmpty(segments)) {
+ for (Segment segment : segments) {
+ if (segment.getState().equals(SegmentStateType.FINISH.toString())) {
+ continue;
+ }
+ segment.setState(SegmentStateType.FINISH.toString());
+ segment.setUpdateTime(now);
+ segment.setUpdateBy(userId);
+ segment.setMemo(Constants.HANDLE);
+ if (!segmentService.updateById(segment)) {
+ throw new CoolException(BaseRes.ERROR);
+ }
+ }
+ // travel
+ travelService.checkFinish(segments.get(0).getTravelId());
+ }
return Boolean.TRUE;
}
@@ -117,20 +146,41 @@
if (null == task) {
return Boolean.FALSE;
}
+ Date now = new Date();
+ // stock
this.maintainLocAndStaHandler(task, Boolean.FALSE);
-
+ // task
task.setTaskSts(TaskStsType.CANCEL.val());
- task.setUpdateTime(new Date());
+ task.setUpdateTime(now);
task.setUpdateBy(userId);
+ task.setMemo(Constants.HANDLE + " " + TaskStsType.CANCEL);
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
busService.checkoutComplete(task.getBusId());
+ // segment
+ List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTaskId, taskId));
+ if (!Cools.isEmpty(segments)) {
+ for (Segment segment : segments) {
+ if (segment.getState().equals(SegmentStateType.FINISH.toString())) {
+ continue;
+ }
+ segment.setState(SegmentStateType.FINISH.toString());
+ segment.setUpdateTime(now);
+ segment.setUpdateBy(userId);
+ segment.setMemo(Constants.HANDLE);
+ if (!segmentService.updateById(segment)) {
+ throw new CoolException(BaseRes.ERROR);
+ }
+ }
+ // travel
+ travelService.checkFinish(segments.get(0).getTravelId());
+ }
return Boolean.TRUE;
}
@Override
- public Lane checkoutOriginLane(Task task) {
+ public LaneDto checkoutOriginLane(Task task) {
Long codeId = null;
TaskTypeType typeType = TaskTypeType.get(task.getTaskTypeEl());
switch (Objects.requireNonNull(typeType)) {
@@ -149,11 +199,11 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getCacheById(codeId).getData());
+ return laneBuilder.search(codeService.getCacheById(codeId).getData());
}
@Override
- public Lane checkoutDestinationLane(Task task) {
+ public LaneDto checkoutDestinationLane(Task task) {
Long codeId = null;
TaskTypeType typeType = TaskTypeType.get(task.getTaskTypeEl());
switch (Objects.requireNonNull(typeType)) {
@@ -172,7 +222,7 @@
if (null == codeId) {
return null;
}
- return laneService.search(codeService.getCacheById(codeId).getData());
+ return laneBuilder.search(codeService.getCacheById(codeId).getData());
}
@Override
--
Gitblit v1.9.1