# version merge

vincentlu

8 天以前 583b31d46bb8abbee7410d29ca229120ee589cba

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

@@ -125,6 +125,18 @@
    private String mqttTopic;

    /**
     * 断开充电{1:是,0:否}
     */
    @ApiModelProperty(value= "断充动作 1: 是  0: 否  ")
    private Integer needUndocking;

    /**
     * 背篓动作 {1:是,0:否}
     */
    @ApiModelProperty(value= "背篓动作 1: 是  0: 否  ")
    private Integer backupAction;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
@@ -172,63 +184,29 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    public AgvModel() {}

    public AgvModel(String uuid,String type,String name,Integer length,Integer width,Integer height,Integer liftHeight,Integer diameter,String password,Integer backpack,Integer lowBattery,Integer quaBattery,Integer travelSpeed,Double workDirection,Integer allDirection,String protocol,String mqttTopic,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.type = type;
        this.name = name;
        this.length = length;
        this.width = width;
        this.height = height;
        this.liftHeight = liftHeight;
        this.diameter = diameter;
        this.password = password;
        this.backpack = backpack;
        this.lowBattery = lowBattery;
        this.quaBattery = quaBattery;
        this.travelSpeed = travelSpeed;
        this.workDirection = workDirection;
        this.allDirection = allDirection;
        this.protocol = protocol;
        this.mqttTopic = mqttTopic;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    public Boolean getNeedUndockingBool(){
        if (null == this.needUndocking){ return null; }
        switch (this.needUndocking){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

//    AgvModel agvModel = new AgvModel(
//            null,    // 编号
//            null,    // 类型
//            null,    // 名称
//            null,    // 长度
//            null,    // 宽度
//            null,    // 高度
//            null,    // 举升高度
//            null,    // 旋转直径
//            null,    // 设备密码
//            null,    // 背篓
//            null,    // 最低电量
//            null,    // 额定电量
//            null,    // 走行速度
//            null,    // 作业方向
//            null,    // 全向
//            null,    // 协议
//            null,    // mqtt主题
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 备注
//    );
    public Boolean getBackupActionBool(){
        if (null == this.backupAction){ return null; }
        switch (this.backupAction){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }

    public Boolean getAllDirectionBool(){
        if (null == this.allDirection){ return null; }