no message

skyouc

19 小时以前 f77481e1f51ea1eada83377ef067e7988f3db356

no message

 src/main/java/com/zy/api/controller/AgvScheduleController.java

@@ -3,6 +3,7 @@
import com.core.common.R;
import com.zy.api.controller.params.AgvCallBackParam;
import com.zy.api.entity.CallAgvParams;
import com.zy.api.entity.dto.HKR;
import com.zy.api.service.AgvScheduleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +43,9 @@
     */
    @ApiOperation("agv搬运结果回传")
    @PostMapping("/agv/result/callback")
    public R agvCarryCallBack(@RequestBody AgvCallBackParam params) {
    public HKR agvCarryCallBack(@RequestBody AgvCallBackParam params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
            return HKR.error("参数不能为空！！");
        }
        return agvScheduleService.callback(params);
    }

 src/main/java/com/zy/api/entity/dto/HKR.java

New file
@@ -0,0 +1,79 @@
package com.zy.api.entity.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.sql.Date;

@Data
@Accessors(chain = true)
@ApiModel(value = "HKR", description = "海康响应信息")
public class HKR<T> {
    private static final String SUCCESS_CODE = "200";
    private static final String FAIL_CODE = "500";

    private String code;

    private String message;

    private Boolean success;

    private String reqCode;

    private Integer errorCode;

    private T result;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date timestamp;

    public HKR() {
        this.timestamp = new Date(System.currentTimeMillis());
    }

    public static <T> HKR<T> ok() {
        return new HKR<T>()
                .setCode("SUCCESS")
                .setSuccess(true)
                .setMessage("操作成功")
                .setErrorCode(0);
    }

    public static <T> HKR<T> ok(T data) {
        return new HKR<T>()
                .setCode("SUCCESS")
                .setSuccess(true)
                .setMessage("操作成功")
                .setErrorCode(0)
                .setResult(data);
    }

    public static <T> HKR<T> ok(T data, String message) {
        return new HKR<T>()
                .setCode("SUCCESS")
                .setSuccess(true)
                .setMessage(message)
                .setErrorCode(0)
                .setResult(data);
    }

    public static <T> HKR<T> error(String message) {
        return new HKR<T>()
                .setCode("ERROR")
                .setSuccess(false)
                .setMessage(message)
                .setErrorCode(0);
    }

    public static <T> HKR<T> error(String code, String message) {
        return new HKR<T>()
                .setCode("ERROR")
                .setSuccess(false)
                .setMessage(message)
                .setErrorCode(500);
    }
}

 src/main/java/com/zy/api/service/AgvScheduleService.java

@@ -3,10 +3,11 @@
import com.core.common.R;
import com.zy.api.controller.params.AgvCallBackParam;
import com.zy.api.entity.CallAgvParams;
import com.zy.api.entity.dto.HKR;

public interface AgvScheduleService {

    R callAgvCarry(CallAgvParams params);

    R callback(AgvCallBackParam params);
    HKR callback(AgvCallBackParam params);
}

 src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java

@@ -9,6 +9,7 @@
import com.zy.api.controller.params.AgvCarriesParam;
import com.zy.api.controller.params.AgvRequestParam;
import com.zy.api.entity.CallAgvParams;
import com.zy.api.entity.dto.HKR;
import com.zy.api.enums.OrderType;
import com.zy.api.service.AgvScheduleService;
import com.zy.asrs.entity.LocCache;
@@ -74,6 +75,10 @@
            task.setWrkSts(TaskStatusType.AGV_TASK_ISSUED_OUT.type);
        }

        if (task.getIsNewIn().equals("M1")) {
            params.setTaskType("M1");
        }

        HIKResultDTO hikResultDTO = sendAgvTask(params, HIKApiConstant.TASK_SUBMIT);

        if (hikResultDTO.isSuccess()) {
@@ -101,16 +106,16 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R callback(AgvCallBackParam params) {
    public HKR callback(AgvCallBackParam params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
            return HKR.error("参数不能为空！！");
        }
        if (Objects.isNull(params.getRobotTaskCode())) {
            return R.error("任务号不能为空！！");
            return HKR.error("任务号不能为空！！");
        }
        Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", params.getRobotTaskCode()));
        if (Objects.isNull(task)) {
            return R.error("任务信息不存在！！");
            return HKR.error("任务信息不存在！！");
        }

        if (Arrays.asList(TaskIOType.ALL_IN.type, TaskIOType.PICK_IN.type, TaskIOType.MERGE_IN.type)
@@ -134,7 +139,7 @@
        if (!taskService.updateById(task)) {
            throw new CoolException("状态修改失败！！");
        }
        return R.ok("执行完成 ！！");
        return HKR.ok("执行完成 ！！");
    }

    public HIKResultDTO sendAgvTask(CallAgvParams param, String path) {