#

luxiaotao1123

2024-09-23 b3a57aab83e0e696707b1ffde99599c14b989b73

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

@@ -4,11 +4,13 @@
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.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.entity.Bus;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -25,6 +27,8 @@

    @Autowired
    private BusService busService;
    @Autowired
    private MainService mainService;

    @PreAuthorize("hasAuthority('manager:bus:list')")
    @PostMapping("/bus/page")
@@ -55,14 +59,8 @@
    @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) {
        Bus bus = mainService.generateBusAndTask();
        return R.ok("Save Success").add(bus);
    }

@@ -94,10 +92,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);
    }