#

vincentlu

1 天以前 f7543a1cc6c89ea03c0d6a0591526baf10d7934b

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/OpenController.java

@@ -2,18 +2,20 @@

import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.IntegrationAuth;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.constant.Constants;
import com.zy.acs.manager.common.domain.TaskBoolDto;
import com.zy.acs.manager.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.OpenBusCancelParam;
import com.zy.acs.manager.core.integrate.dto.OpenBusCancelResult;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.BusService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.system.controller.BaseController;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;

/**
 * Created by vincent on 2023/6/12
 */
@@ -29,7 +33,7 @@
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
public class OpenController extends BaseController {
public class OpenController {

    @Autowired
    private MainService mainService;
@@ -40,13 +44,15 @@

    @PostMapping("/bus/submit")
    @OperationLog("generate task from open api")
    public R submit(@RequestBody OpenBusSubmitParam param) {
    @IntegrationAuth(name = NamespaceType.RCS_BUS_RECEIVE)
    public R submit(@RequestBody OpenBusSubmitParam param, HttpServletRequest request) {
        mainService.generateBusAndTask(param, null);
        return R.ok("generate tasks success");
    }

    @PostMapping("/task/cancel")
    @OperationLog("cancel task from open api")
    @IntegrationAuth(name = NamespaceType.RCS_TASK_CANCEL)
    public R cancel(@RequestBody OpenBusCancelParam param) {
        if (Cools.isEmpty(param.getBatchNo())) {
            return R.error("batchNo is empty");
@@ -63,7 +69,11 @@
        for (String taskNo : param.getTasks()) {
            Task task = taskService.selectBySeqNum(bus.getId(), taskNo);
            if (null == task) {
                result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE,  taskNo + " is not exist"));
                result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE, "task " + taskNo + " is not exist"));
                continue;
            }
            if (!task.getTaskSts().equals(TaskStsType.INIT.val())) {
                result.getTasks().add(new TaskBoolDto(taskNo, Boolean.FALSE,  "task " + taskNo + " has already been assigned"));
                continue;
            }
            Boolean cancel = false;
@@ -72,7 +82,7 @@
            } catch (Exception e) {
                log.error("failed to cancel task {}", taskNo, e);
            }
            result.getTasks().add(new TaskBoolDto(taskNo, cancel));
            result.getTasks().add(new TaskBoolDto(taskNo, cancel, "failed to cancel task " + taskNo));
        }
        return R.ok("cancel tasks success").add(result);
    }