#

vincentlu

20 小时以前 1a518d788ee36886af92b2adfcbe9e79e83ef08e

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java

@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.manager.service.AgvService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -62,6 +59,18 @@
    private String taskIds;

    /**
     * 滚筒线等待 1: 是  0: 否
     */
    @ApiModelProperty(value= "滚筒线等待 1: 是  0: 否  ")
    private Integer rollerWaiting;

    /**
     * 滚筒线等待地码
     */
    @ApiModelProperty(value= "滚筒线等待地码")
    private Long rollerWaitingCode;

    /**
     * 进度
     */
    @ApiModelProperty(value= "进度")
@@ -115,65 +124,17 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    public Travel() {}

    public Travel(String uuid,String travelId,Long agvId,Long currSeg,String taskContent,String taskIds,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.travelId = travelId;
        this.agvId = agvId;
        this.currSeg = currSeg;
        this.taskContent = taskContent;
        this.taskIds = taskIds;
        this.state = state;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    Travel travel = new Travel(
//            null,    // 编号
//            null,    // 组编号
//            null,    // AGV
//            null,    // 当前节点
//            null,    // 内容
//            null,    // 任务列表
//            null,    // 进度
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getAgvId$(){
        AgvService service = SpringUtils.getBean(AgvService.class);
        Agv agv = service.getById(this.agvId);
        if (!Cools.isEmpty(agv)){
            return String.valueOf(agv.getUuid());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
    public Boolean rollerWaitingBool(){
        if (null == this.rollerWaiting){ return null; }
        switch (this.rollerWaiting){
            case 1:
                return "正常";
                return true;
            case 0:
                return "冻结";
                return false;
            default:
                return String.valueOf(this.status);
                return null;
        }
    }


    public Boolean getStatusBool(){
        if (null == this.status){ return null; }