#

luxiaotao1123

2 天以前 b22c773435474fcdaea05c6239d9cc94bbfd499c

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

@@ -10,10 +10,11 @@
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.IntegrationRecord;
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;
@@ -29,7 +30,7 @@
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
public class OpenController extends BaseController {
public class OpenController {

    @Autowired
    private MainService mainService;
@@ -41,6 +42,26 @@
    @PostMapping("/bus/submit")
    @OperationLog("generate task from open api")
    public R submit(@RequestBody OpenBusSubmitParam param) {
        IntegrationRecord integrationRecord = new IntegrationRecord(
                null,    // 编号
                null,    // 名称空间
                null,    // 接口地址
                null,    // 平台密钥
                null,    // 调用方标识
                null,    // 方向[非空]
                null,    // 时间戳
                null,    // 客户端IP
                null,    // 请求内容
                null,    // 响应内容
                null,    // 异常内容
                null,    // 结果
                null,    // 耗时
                null,    // 状态
                null,    // 添加时间[非空]
                null,    // 修改时间[非空]
                null    // 备注
        );

        mainService.generateBusAndTask(param, null);
        return R.ok("generate tasks success");
    }
@@ -63,7 +84,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 +97,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);
    }