lsh#

1

2 天以前 786fccc26cb790d75be1d95077675163699abcf3

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java

@@ -2,6 +2,7 @@

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,11 +47,11 @@
    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @ApiOperation("站点绑定")
    @PostMapping("/AGV/staBind")
    public R getAGVStaBind(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
    public R getAGVStaBind(@RequestBody WaitPakinParam waitPakinPda) {
        if (Objects.isNull(waitPakinPda)) {
            return R.error("参数不能为空！！");
        }
        return agvService.getAGVStaBind(params);
        return agvService.getAGVStaBind(waitPakinPda);
    }

    @PreAuthorize("hasAuthority('manager:basStation:list')")
@@ -66,20 +67,20 @@
    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @ApiOperation("AGV启动入库")
    @PostMapping("/AGV/task/start")
    public R AGVInTaskStart(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
    public R AGVInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
        if (Objects.isNull(waitPakinPda)) {
            return R.error("参数不能为空！！");
        }
        return agvService.AGVInTaskStart(params, getLoginUserId());
        return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:basStation:list')")
    @ApiOperation("AGV绑定&入库")
    @PostMapping("/AGV/bindAndIn/start")
    public R AGVBindAndInTaskStart(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
    public R AGVBindAndInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
        if (Objects.isNull(waitPakinPda)) {
            return R.error("参数不能为空！！");
        }
        return agvService.AGVBindAndInTaskStart(params, getLoginUserId());
        return agvService.AGVBindAndInTaskStart(waitPakinPda, getLoginUserId());
    }
}