#

vincentlu

1 天以前 f7543a1cc6c89ea03c0d6a0591526baf10d7934b

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/Constants.java

@@ -8,6 +8,8 @@

    public static final String UPLINK = "UPLINK";

    public static final String DOWNLINK = "DOWNLINK";

    public static final String HANDLE = "HANDLE";

    public static final String LIMIT_ONE = "limit 1";

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/NamespaceType.java

@@ -8,6 +8,7 @@
    RCS_TASK_REPORT("任务完成上报", Constants.RCS),
    RCS_BUS_RECEIVE("接收批次任务", Constants.UPLINK),
    RCS_TASK_CANCEL("任务取消", Constants.UPLINK),
    RCS_STA_QUERY("站点状态查询", Constants.DOWNLINK),
    ;

    public String desc;

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryParam;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryResult;
import com.zy.acs.manager.manager.entity.Sta;
@@ -28,6 +30,7 @@
    private StaService staService;

    @PostMapping("/station/convey")
    @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY)
    public R save(@RequestBody ConveyorQueryParam param) {
        List<ConveyorQueryResult> resultList = new ArrayList<>();


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

@@ -12,7 +12,6 @@
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;
@@ -47,27 +46,6 @@
    @OperationLog("generate task from open api")
    @IntegrationAuth(name = NamespaceType.RCS_BUS_RECEIVE)
    public R submit(@RequestBody OpenBusSubmitParam param, HttpServletRequest request) {
        IntegrationRecord integrationRecord = new IntegrationRecord(
                null,    // 编号
                null,    // 名称空间
                null,    // 接口地址
                null,    // 平台密钥
                null,    // 调用方标识
                null,    // 方向[非空]
                null,    // 时间戳
                null,    // 客户端IP
                null,    // 请求内容
                null,    // 响应内容
                null,    // 异常内容
                null,    // 结果
                null,    // 耗时
                null,    // 状态
                null,    // 添加时间[非空]
                null,    // 修改时间[非空]
                null    // 备注
        );
        request.setAttribute("integrationRecord", integrationRecord);

        mainService.generateBusAndTask(param, null);
        return R.ok("generate tasks success");
    }