#

vincentlu

6 天以前 9741bd10f294f85fd851e4564b33d107987f90b1

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java

@@ -6,6 +6,7 @@
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;
@@ -43,6 +44,12 @@
    private LaneService laneService;
    @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,15 +146,36 @@
        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;
    }