#

Junjie

2023-09-09 f9e8c70a0d863c752f4558b0f0b0de8179a575d9

#

 src/main/java/com/zy/asrs/entity/BasShuttle.java

@@ -121,134 +121,176 @@
    private Boolean pakMk;

    /**
     * 小车忙状态位
     */
    @ApiModelProperty(value= "小车忙状态位")
    @TableField("busy_status")
    private Integer busyStatus;

    /**
     * 当前二维码
     */
    @ApiModelProperty(value= "当前二维码")
    @TableField("current_code")
    private Integer currentCode;

    /**
     * 电池电量百分比
     */
    @ApiModelProperty(value= "电池电量百分比")
    @TableField("battery_power")
    private Integer batteryPower;

    /**
     * 电池温度
     */
    @ApiModelProperty(value= "电池温度")
    @TableField("battery_temp")
    private Integer batteryTemp;

    /**
     * 错误编号
     */
    @ApiModelProperty(value= "错误编号")
    @TableField("error_code")
    private Integer errorCode;

    /**
     * Plc输出状态IO
     */
    @ApiModelProperty(value= "Plc输出状态IO")
    @TableField("plc_output_status_io")
    private Integer plcOutputStatusIo;

    /**
     * 错误信息码
     */
    @ApiModelProperty(value= "错误信息码")
    @TableField("status_error_code")
    private Integer statusErrorCode;

    /**
     * PLC输入状态
     */
    @ApiModelProperty(value= "PLC输入状态")
    @TableField("plc_input_status")
    private Integer plcInputStatus;

    /**
     * 当前或者之前读到的二维码值
     */
    @ApiModelProperty(value= "当前或者之前读到的二维码值")
    @TableField("current_or_before_code")
    private Integer currentOrBeforeCode;

    /**
     * 读到的二维码X方向偏移量
     */
    @ApiModelProperty(value= "读到的二维码X方向偏移量")
    @TableField("code_offset_x")
    private Integer codeOffsetX;

    /**
     * 读到的二维码Y方向偏移量
     */
    @ApiModelProperty(value= "读到的二维码Y方向偏移量")
    @TableField("code_offset_y")
    private Integer codeOffsetY;

    /**
     * 当前的电压值
     */
    @ApiModelProperty(value= "当前的电压值")
    @TableField("current_voltage")
    private Integer currentVoltage;

    /**
     * 当前的模拟量值
     */
    @ApiModelProperty(value= "当前的模拟量值")
    @TableField("current_analog_value")
    private Integer currentAnalogValue;

    /**
     * 当前的升降伺服速度
     */
    @ApiModelProperty(value= "当前的升降伺服速度")
    @TableField("current_lift_servo_speed")
    private Integer currentLiftServoSpeed;

    /**
     * 当前的行走伺服速度
     */
    @ApiModelProperty(value= "当前的行走伺服速度")
    @TableField("current_move_servo_speed")
    private Integer currentMoveServoSpeed;

    /**
     * 当前的升降伺服负载率
     */
    @ApiModelProperty(value= "当前的升降伺服负载率")
    @TableField("current_lift_servo_load")
    private Integer currentLiftServoLoad;

    /**
     * 当前的行走伺服负载率
     */
    @ApiModelProperty(value= "当前的行走伺服负载率")
    @TableField("current_move_servo_load")
    private Integer currentMoveServoLoad;

    /**
     * 小车运行速度
     */
    @ApiModelProperty(value= "小车运行速度")
    @TableField("run_speed")
    private Integer runSpeed;

    /**
     * 牛眼-工作模式
     */
    @ApiModelProperty(value= "工作模式")
    @TableField("working_mode")
    private Integer workingMode;

    /**
     * 牛眼-运行状态
     */
    @ApiModelProperty(value= "运行状态")
    @TableField("free")
    private Integer free;

    /**
     * 牛眼-当前速度
     */
    @ApiModelProperty(value= "当前速度")
    @TableField("speed")
    private Integer speed;

    /**
     * 牛眼-负载状态
     */
    @ApiModelProperty(value= "负载状态")
    @TableField("load_state")
    private Integer loadState;

    /**
     * 牛眼-管制状态
     */
    @ApiModelProperty(value= "管制状态")
    @TableField("suspend_state")
    private Integer suspendState;

    /**
     * 牛眼-顶升位置
     */
    @ApiModelProperty(value= "顶升位置")
    @TableField("lift_position")
    private Integer liftPosition;

    /**
     * 牛眼-运行方向
     */
    @ApiModelProperty(value= "运行方向")
    @TableField("run_dir")
    private Integer runDir;

    /**
     * 牛眼-运行方向
     */
    @ApiModelProperty(value= "运行方向")
    @TableField("run_dir2")
    private Integer runDir2;

    /**
     * 牛眼-充电状态
     */
    @ApiModelProperty(value= "充电状态")
    @TableField("charg_state")
    private Integer chargState;

    /**
     * 牛眼-电池电量
     */
    @ApiModelProperty(value= "电池电量")
    @TableField("power_percent")
    private Integer powerPercent;

    /**
     * 牛眼-最高电芯电压
     */
    @ApiModelProperty(value= "最高电芯电压")
    @TableField("max_cell_voltage")
    private Integer maxCellVoltage;

    /**
     * 牛眼-最低电芯电压
     */
    @ApiModelProperty(value= "最低电芯电压")
    @TableField("min_cell_voltage")
    private Integer minCellVoltage;

    /**
     * 牛眼-电池电压
     */
    @ApiModelProperty(value= "电池电压")
    @TableField("voltage")
    private Integer voltage;

    /**
     * 牛眼-充放电循环次数
     */
    @ApiModelProperty(value= "充放电循环次数")
    @TableField("charge_cycle_times")
    private Integer chargeCycleTimes;

    /**
     * 牛眼-剩余电量
     */
    @ApiModelProperty(value= "剩余电量")
    @TableField("surplus_quantity")
    private Integer surplusQuantity;

    /**
     * 牛眼-总电量
     */
    @ApiModelProperty(value= "总电量")
    @TableField("count_quantity")
    private Integer countQuantity;

    /**
     * 牛眼-实际库位
     */
    @ApiModelProperty(value= "实际库位")
    @TableField("point")
    private String point;

    /**
     * 牛眼-实际坐标
     */
    @ApiModelProperty(value= "实际坐标")
    @TableField("coord")
    private String coord;

    /**
     * 牛眼-任务目的库位
     */
    @ApiModelProperty(value= "任务目的库位")
    @TableField("task")
    private String task;

    /**
     * 牛眼-任务状态
     */
    @ApiModelProperty(value= "任务状态")
    @TableField("task_state")
    private Integer taskState;

    /**
     * 牛眼-故障状态
     */
    @ApiModelProperty(value= "故障状态")
    @TableField("err_state")
    private Integer errState;

    /**
     * 牛眼-总里程数
     */
    @ApiModelProperty(value= "总里程数")
    @TableField("status_sum")
    private String statusSum;

    /**
     * 牛眼-非自动状态时间计时
     */
    @ApiModelProperty(value= "非自动状态时间计时")
    @TableField("err_time")
    private Integer errTime;

    public BasShuttle() {}

    public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo,Boolean pakMk,Integer busyStatus,Integer currentCode,Integer batteryPower,Integer batteryTemp,Integer errorCode,Integer plcOutputStatusIo,Integer statusErrorCode,Integer plcInputStatus,Integer currentOrBeforeCode,Integer codeOffsetX,Integer codeOffsetY,Integer currentVoltage,Integer currentAnalogValue,Integer currentLiftServoSpeed,Integer currentMoveServoSpeed,Integer currentLiftServoLoad,Integer currentMoveServoLoad) {
    public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, Integer runSpeed, Integer workingMode, Integer free, Integer speed, Integer loadState, Integer suspendState, Integer liftPosition, Integer runDir, Integer runDir2, Integer chargState, Integer powerPercent, Integer maxCellVoltage, Integer minCellVoltage, Integer voltage, Integer chargeCycleTimes, Integer surplusQuantity, Integer countQuantity, String point, String coord, String task, Integer taskState, Integer errState, String statusSum, Integer errTime) {
        this.shuttleNo = shuttleNo;
        this.status = status;
        this.shuttleStatus = shuttleStatus;
@@ -263,26 +305,33 @@
        this.memo = memo;
        this.liftNo = liftNo;
        this.pakMk = pakMk;
        this.busyStatus = busyStatus;
        this.currentCode = currentCode;
        this.batteryPower = batteryPower;
        this.batteryTemp = batteryTemp;
        this.errorCode = errorCode;
        this.plcOutputStatusIo = plcOutputStatusIo;
        this.statusErrorCode = statusErrorCode;
        this.plcInputStatus = plcInputStatus;
        this.currentOrBeforeCode = currentOrBeforeCode;
        this.codeOffsetX = codeOffsetX;
        this.codeOffsetY = codeOffsetY;
        this.currentVoltage = currentVoltage;
        this.currentAnalogValue = currentAnalogValue;
        this.currentLiftServoSpeed = currentLiftServoSpeed;
        this.currentMoveServoSpeed = currentMoveServoSpeed;
        this.currentLiftServoLoad = currentLiftServoLoad;
        this.currentMoveServoLoad = currentMoveServoLoad;
        this.runSpeed = runSpeed;
        this.workingMode = workingMode;
        this.free = free;
        this.speed = speed;
        this.loadState = loadState;
        this.suspendState = suspendState;
        this.liftPosition = liftPosition;
        this.runDir = runDir;
        this.runDir2 = runDir2;
        this.chargState = chargState;
        this.powerPercent = powerPercent;
        this.maxCellVoltage = maxCellVoltage;
        this.minCellVoltage = minCellVoltage;
        this.voltage = voltage;
        this.chargeCycleTimes = chargeCycleTimes;
        this.surplusQuantity = surplusQuantity;
        this.countQuantity = countQuantity;
        this.point = point;
        this.coord = coord;
        this.task = task;
        this.taskState = taskState;
        this.errState = errState;
        this.statusSum = statusSum;
        this.errTime = errTime;
    }

//    BasShuttle basShuttle = new BasShuttle(
    //    BasShuttle basShuttle = new BasShuttle(
//            null,    // 四向穿梭车号[非空]
//            null,    // 状态
//            null,    // 当前小车状态（内部自我维护）
@@ -358,34 +407,6 @@
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public String getBusyStatus$() {
        if (Cools.isEmpty(this.busyStatus)){
            return "";
        }
        switch (this.busyStatus){
            case 1:
                return "忙碌";
            case 0:
                return "空闲";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getBatteryPower$() {
        if (Cools.isEmpty(this.batteryPower)){
            return "";
        }
        return (this.batteryPower * 0.1) + "%";
    }

    public String getBatteryTemp$() {
        if (Cools.isEmpty(this.batteryTemp)){
            return "";
        }
        return (this.batteryTemp * 0.1) + "%";
    }

    public int getPakMk() {

 src/main/resources/mapper/BasShuttleMapper.xml

@@ -18,23 +18,30 @@
        <result column="memo" property="memo" />
        <result column="lift_no" property="liftNo" />
        <result column="pak_mk" property="pakMk" />
        <result column="busy_status" property="busyStatus" />
        <result column="current_code" property="currentCode" />
        <result column="battery_power" property="batteryPower" />
        <result column="battery_temp" property="batteryTemp" />
        <result column="error_code" property="errorCode" />
        <result column="plc_output_status_io" property="plcOutputStatusIo" />
        <result column="status_error_code" property="statusErrorCode" />
        <result column="plc_input_status" property="plcInputStatus" />
        <result column="current_or_before_code" property="currentOrBeforeCode" />
        <result column="code_offset_x" property="codeOffsetX" />
        <result column="code_offset_y" property="codeOffsetY" />
        <result column="current_voltage" property="currentVoltage" />
        <result column="current_analog_value" property="currentAnalogValue" />
        <result column="current_lift_servo_speed" property="currentLiftServoSpeed" />
        <result column="current_move_servo_speed" property="currentMoveServoSpeed" />
        <result column="current_lift_servo_load" property="currentLiftServoLoad" />
        <result column="current_move_servo_load" property="currentMoveServoLoad" />

        <result column="working_mode" property="workingMode" />
        <result column="free" property="free" />
        <result column="speed" property="speed" />
        <result column="load_state" property="loadState" />
        <result column="suspend_state" property="suspendState" />
        <result column="lift_position" property="liftPosition" />
        <result column="run_dir" property="runDir" />
        <result column="run_dir2" property="runDir2" />
        <result column="charg_state" property="chargState" />
        <result column="power_percent" property="powerPercent" />
        <result column="max_cell_voltage" property="maxCellVoltage" />
        <result column="min_cell_voltage" property="minCellVoltage" />
        <result column="voltage" property="voltage" />
        <result column="charge_cycle_times" property="chargeCycleTimes" />
        <result column="surplus_quantity" property="surplusQuantity" />
        <result column="count_quantity" property="countQuantity" />
        <result column="point" property="point" />
        <result column="coord" property="coord" />
        <result column="task" property="task" />
        <result column="task_state" property="taskState" />
        <result column="err_state" property="errState" />
        <result column="status_sum" property="statusSum" />
        <result column="err_time" property="errTime" />

    </resultMap>