#

luxiaotao1123

2024-09-23 4fe1a741d807b55f7fc14aed85e232b9d7972425

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

@@ -11,9 +11,11 @@
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.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;
@@ -34,13 +36,19 @@
    private StaService staService;
    @Autowired
    private LocService locService;
    @Autowired
    private TaskService taskService;

    @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)));
        PageParam<Bus, BaseParam> page = busService.page(pageParam, pageParam.buildWrapper(true));
        for (Bus record : page.getRecords()) {
            record.setTasksNum(taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId())));
        }
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:bus:list')")
@@ -66,7 +74,7 @@
    @PostMapping("/bus/save")
    public R save(@RequestBody BusCreateParam param) {
        OpenBusSubmitParam submitParam = new OpenBusSubmitParam();
        submitParam.setBatch(param.getBatch());
        submitParam.setBatch(param.getBusNo());
        for (TaskIdByLongDto dto : param.getTaskList()) {
            TaskDto taskDto = new TaskDto();
            taskDto.setSeqNum(dto.getSeqNum());
@@ -75,13 +83,13 @@
                taskDto.setOriSta(staService.getById(dto.getOriSta()).getStaNo());
            }
            if (!Cools.isEmpty(dto.getOriLoc())) {
                taskDto.setOriSta(locService.getById(dto.getOriLoc()).getLocNo());
                taskDto.setOriLoc(locService.getById(dto.getOriLoc()).getLocNo());
            }
            if (!Cools.isEmpty(dto.getDestSta())) {
                taskDto.setOriSta(staService.getById(dto.getDestSta()).getStaNo());
                taskDto.setDestSta(staService.getById(dto.getDestSta()).getStaNo());
            }
            if (!Cools.isEmpty(dto.getDestLoc())) {
                taskDto.setOriSta(locService.getById(dto.getDestLoc()).getLocNo());
                taskDto.setDestLoc(locService.getById(dto.getDestLoc()).getLocNo());
            }
            submitParam.getTaskList().add(taskDto);
        }