#

luxiaotao1123

2024-09-24 9f90ab48ee848a56f45c80e5d050676d4f3a6c2f

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -1,16 +1,24 @@
package com.zy.acs.manager.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.*;
import com.zy.acs.manager.common.utils.BusinessSortService;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.controller.param.BusCreateParam;
import com.zy.acs.manager.manager.controller.param.OpenBusSubmitParam;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.BusStsType;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,6 +26,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/api")
@@ -25,13 +34,35 @@

    @Autowired
    private BusService busService;
    @Autowired
    private MainService mainService;
    @Autowired
    private StaService staService;
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private BusinessSortService businessSortService;

    @PreAuthorize("hasAuthority('manager:bus:list')")
    @PostMapping("/bus/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
        return R.ok().add(busService.page(pageParam, pageParam.buildWrapper(true)));
        QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
        if (hasCreateTimeDesc(pageParam.getOrders())) {
            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
        }
        PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);
        for (Bus record : page.getRecords()) {
            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
            if (!Cools.isEmpty(tasks)) {
                record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
                record.setTasksNum(tasks.size());
            }
        }
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:bus:list')")
@@ -55,14 +86,28 @@
    @PreAuthorize("hasAuthority('manager:bus:save')")
    @OperationLog("Create Bus")
    @PostMapping("/bus/save")
    public R save(@RequestBody Bus bus) {
        bus.setCreateBy(getLoginUserId());
        bus.setCreateTime(new Date());
        bus.setUpdateBy(getLoginUserId());
        bus.setUpdateTime(new Date());
        if (!busService.save(bus)) {
            return R.error("Save Fail");
    public R save(@RequestBody BusCreateParam param) {
        OpenBusSubmitParam submitParam = new OpenBusSubmitParam();
        submitParam.setBatch(param.getBusNo());
        for (TaskIdByLongDto dto : param.getTaskList()) {
            TaskDto taskDto = new TaskDto();
            taskDto.setSeqNum(dto.getSeqNum());
            taskDto.setPriority(dto.getPriority());
            if (!Cools.isEmpty(dto.getOriSta())) {
                taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo());
            }
            if (!Cools.isEmpty(dto.getOriLoc())) {
                taskDto.setOriLoc(locService.getById(dto.getOriLoc()).getLocNo());
            }
            if (!Cools.isEmpty(dto.getDestSta())) {
                taskDto.setDestSta(staService.getById(dto.getDestSta()).getStaNo());
            }
            if (!Cools.isEmpty(dto.getDestLoc())) {
                taskDto.setDestLoc(locService.getById(dto.getDestLoc()).getLocNo());
            }
            submitParam.getTaskList().add(taskDto);
        }
        Bus bus = mainService.generateBusAndTask(submitParam, param.getMemo());
        return R.ok("Save Success").add(bus);
    }

@@ -94,10 +139,10 @@
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Bus> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Bus::getSeqNum, condition);
            wrapper.like(Bus::getBusNo, condition);
        }
        busService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getSeqNum()))
                item -> vos.add(new KeyValVo(item.getId(), item.getBusNo()))
        );
        return R.ok().add(vos);
    }