From 80f5003a640db7795d69c5e3a73caa685c289b80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 14 一月 2026 16:27:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 30 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 248ee81..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;
}
- this.maintainLocSts(task, Boolean.TRUE);
-
+ 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;
}
- this.maintainLocSts(task, 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
@@ -300,7 +350,7 @@
@Transactional
- public void maintainLocSts(Task task, Boolean complete) {
+ public void maintainLocAndStaHandler(Task task, Boolean complete) {
Loc oriLoc = null; Loc destLoc = null;
Sta oriSta = null; Sta destSta = null;
Date now = new Date();
@@ -331,18 +381,18 @@
}
destSta = staService.getById(task.getDestSta());
- destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
- destSta.setUpdateTime(now);
- if (!staService.updateById(destSta)) {
- throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(destSta, task, 1, StaReserveType.IN);
+ } else {
+ staReserveService.cancelStaReserve(destSta, task, 1, StaReserveType.IN);
}
break;
case STA_TO_LOC:
oriSta = staService.getById(task.getOriSta());
- oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
- oriSta.setUpdateTime(now);
- if (!staService.updateById(oriSta)) {
- throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(oriSta, task, 1, StaReserveType.OUT);
+ } else {
+ staReserveService.cancelStaReserve(oriSta, task, 1, StaReserveType.OUT);
}
destLoc = locService.getById(task.getDestLoc());
@@ -354,17 +404,17 @@
break;
case STA_TO_STA:
oriSta = staService.getById(task.getOriSta());
- oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
- oriSta.setUpdateTime(now);
- if (!staService.updateById(oriSta)) {
- throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(oriSta, task, 1, StaReserveType.OUT);
+ } else {
+ staReserveService.cancelStaReserve(oriSta, task, 1, StaReserveType.OUT);
}
destSta = staService.getById(task.getDestSta());
- destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
- destSta.setUpdateTime(now);
- if (!staService.updateById(destSta)) {
- throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(destSta, task, 1, StaReserveType.IN);
+ } else {
+ staReserveService.cancelStaReserve(destSta, task, 1, StaReserveType.IN);
}
break;
case TO_CHARGE:
--
Gitblit v1.9.1