#优化地图

whycq

2024-11-25 bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef

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

@@ -71,152 +71,120 @@
    private Integer pakMk;

    /**
     * 提升机锁定
     * 提升机坐标
     */
    @ApiModelProperty(value= "提升机锁定")
    @TableField("lift_lock")
    private Integer liftLock;
    @ApiModelProperty(value= "提升机坐标")
    @TableField("point")
    private String point;

    /**
     * 位置到达反馈
     * 模式
     */
    @ApiModelProperty(value= "位置到达反馈")
    @TableField("position_arrival_feedback")
    private Integer positionArrivalFeedback;
    @ApiModelProperty(value= "模式")
    @TableField("model")
    private Boolean model;

    /**
     * 准备就绪
     * 忙闲
     */
    @ApiModelProperty(value= "准备就绪")
    private Integer ready;
    @ApiModelProperty(value= "忙闲")
    @TableField("busy")
    private Boolean busy;

    /**
     * 运行中
     * 前超限
     */
    @ApiModelProperty(value= "运行中")
    private Integer running;
    @ApiModelProperty(value= "前超限")
    @TableField("front_overrun")
    private Boolean frontOverrun;

    /**
     * 联机/单机
     * 后超限
     */
    @ApiModelProperty(value= "联机/单机")
    private Integer mode;
    @ApiModelProperty(value= "后超限")
    @TableField("back_overrun")
    private Boolean backOverrun;

    /**
     * 输送线前端光电有货
     * 左超限
     */
    @ApiModelProperty(value= "输送线前端光电有货")
    @TableField("line_front_has_stock")
    private Integer lineFrontHasStock;
    @ApiModelProperty(value= "左超限")
    @TableField("left_overrun")
    private Boolean leftOverrun;

    /**
     * 输送线正转反馈
     * 右超限
     */
    @ApiModelProperty(value= "输送线正转反馈")
    @TableField("forward_rotation_feedback")
    private Integer forwardRotationFeedback;
    @ApiModelProperty(value= "右超限")
    @TableField("right_overrun")
    private Boolean rightOverrun;

    /**
     * 输送线反转反馈
     * 超高
     */
    @ApiModelProperty(value= "输送线反转反馈")
    @TableField("reverse_feedback")
    private Integer reverseFeedback;
    @ApiModelProperty(value= "超高")
    @TableField("over_height")
    private Boolean overHeight;

    /**
     * 输送线电机过载
     * 超重
     */
    @ApiModelProperty(value= "输送线电机过载")
    @TableField("motor_overload")
    private Integer motorOverload;
    @ApiModelProperty(value= "超重")
    @TableField("over_weight")
    private Boolean overWeight;

    /**
     * 输送线末端光电有货
     * 有托盘
     */
    @ApiModelProperty(value= "输送线末端光电有货")
    @TableField("line_end_has_stock")
    private Integer lineEndHasStock;
    @ApiModelProperty(value= "有托盘")
    @TableField("has_tray")
    private Boolean hasTray;

    /**
     * 进输送线卡托盘报警
     * 有小车
     */
    @ApiModelProperty(value= "进输送线卡托盘报警")
    @TableField("in_convey_line_card_tray_alarm")
    private Integer inConveyLineCardTrayAlarm;
    @ApiModelProperty(value= "有小车")
    @TableField("has_car")
    private Boolean hasCar;

    /**
     * 出输送线卡托盘报警
     * 设备故障
     */
    @ApiModelProperty(value= "出输送线卡托盘报警")
    @TableField("out_convey_line_card_tray_alarm")
    private Integer outConveyLineCardTrayAlarm;
    @ApiModelProperty(value= "设备故障")
    @TableField("device_error")
    private Boolean deviceError;

    /**
     * 平台位置偏差报警
     * 任务地址
     */
    @ApiModelProperty(value= "平台位置偏差报警")
    @TableField("plat_position_deviation_alarm")
    private Integer platPositionDeviationAlarm;
    @ApiModelProperty(value= "任务地址")
    @TableField("task_address")
    private Integer taskAddress;

    /**
     * 平台扭矩偏差报警
     * 目的地址
     */
    @ApiModelProperty(value= "平台扭矩偏差报警")
    @TableField("plat_torque_deviation_alarm")
    private Integer platTorqueDeviationAlarm;
    @ApiModelProperty(value= "目的地址")
    @TableField("dist_address")
    private Integer distAddress;

    /**
     * 平台四向车检测
     * 已完成任务号
     */
    @ApiModelProperty(value= "平台四向车检测")
    @TableField("plat_shuttle_check")
    private Integer platShuttleCheck;
    @ApiModelProperty(value= "已完成任务号")
    @TableField("complete_task_no")
    private Integer completeTaskNo;

    /**
     * 未就绪状态
     * 楼层
     */
    @ApiModelProperty(value= "未就绪状态")
    @TableField("not_ready")
    private Integer notReady;

    /**
     * 伺服1错误
     */
    @ApiModelProperty(value= "伺服1错误")
    @TableField("servo_error1")
    private Integer servoError1;

    /**
     * 伺服2错误
     */
    @ApiModelProperty(value= "伺服2错误")
    @TableField("servo_error2")
    private Integer servoError2;

    /**
     * 伺服3错误
     */
    @ApiModelProperty(value= "伺服3错误")
    @TableField("servo_error3")
    private Integer servoError3;

    /**
     * 伺服4错误
     */
    @ApiModelProperty(value= "伺服4错误")
    @TableField("servo_error4")
    private Integer servoError4;

    /**
     * 提升机实际速度反馈
     */
    @ApiModelProperty(value= "提升机实际速度反馈")
    @TableField("lift_actual_speed")
    private Integer liftActualSpeed;
    @ApiModelProperty(value= "楼层")
    @TableField("lev")
    private Integer lev;

    public BasLift() {}

    public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Integer pakMk,Integer liftLock,Integer positionArrivalFeedback,Integer ready,Integer running,Integer mode,Integer lineFrontHasStock,Integer forwardRotationFeedback,Integer reverseFeedback,Integer motorOverload,Integer lineEndHasStock,Integer inConveyLineCardTrayAlarm,Integer outConveyLineCardTrayAlarm,Integer platPositionDeviationAlarm,Integer platTorqueDeviationAlarm,Integer platShuttleCheck,Integer notReady,Integer servoError1,Integer servoError2,Integer servoError3,Integer servoError4,Integer liftActualSpeed) {
    public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Integer pakMk, String point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
        this.liftNo = liftNo;
        this.status = status;
        this.wrkNo = wrkNo;
@@ -224,30 +192,25 @@
        this.updateBy = updateBy;
        this.memo = memo;
        this.pakMk = pakMk;
        this.liftLock = liftLock;
        this.positionArrivalFeedback = positionArrivalFeedback;
        this.ready = ready;
        this.running = running;
        this.mode = mode;
        this.lineFrontHasStock = lineFrontHasStock;
        this.forwardRotationFeedback = forwardRotationFeedback;
        this.reverseFeedback = reverseFeedback;
        this.motorOverload = motorOverload;
        this.lineEndHasStock = lineEndHasStock;
        this.inConveyLineCardTrayAlarm = inConveyLineCardTrayAlarm;
        this.outConveyLineCardTrayAlarm = outConveyLineCardTrayAlarm;
        this.platPositionDeviationAlarm = platPositionDeviationAlarm;
        this.platTorqueDeviationAlarm = platTorqueDeviationAlarm;
        this.platShuttleCheck = platShuttleCheck;
        this.notReady = notReady;
        this.servoError1 = servoError1;
        this.servoError2 = servoError2;
        this.servoError3 = servoError3;
        this.servoError4 = servoError4;
        this.liftActualSpeed = liftActualSpeed;
        this.point = point;
        this.model = model;
        this.busy = busy;
        this.frontOverrun = frontOverrun;
        this.backOverrun = backOverrun;
        this.leftOverrun = leftOverrun;
        this.rightOverrun = rightOverrun;
        this.overHeight = overHeight;
        this.overWeight = overWeight;
        this.hasTray = hasTray;
        this.hasCar = hasCar;
        this.deviceError = deviceError;
        this.taskAddress = taskAddress;
        this.distAddress = distAddress;
        this.completeTaskNo = completeTaskNo;
        this.lev = lev;
    }

//    BasLift basLift = new BasLift(
    //    BasLift basLift = new BasLift(
//            null,    // 提升机号[非空]
//            null,    // 当前任务状态
//            null,    // 任务号
@@ -299,41 +262,6 @@
            return "";
        }
        return this.pakMk == 1 ? "Y" : "N";
    }

    public String getLiftLock$() {
        if (Cools.isEmpty(this.liftLock)){
            return "";
        }
        return this.liftLock == 1 ? "Y" : "N";
    }

    public String getReady$() {
        if (Cools.isEmpty(this.ready)){
            return "";
        }
        return this.ready == 1 ? "Y" : "N";
    }

    public String getRunning$() {
        if (Cools.isEmpty(this.running)){
            return "";
        }
        return this.running == 1 ? "Y" : "N";
    }

    public String getMode$() {
        if (Cools.isEmpty(this.mode)){
            return "";
        }
        return this.mode == 1 ? "联机" : "单机";
    }

    public String getNotReady$() {
        if (Cools.isEmpty(this.notReady)){
            return "";
        }
        return this.notReady == 1 ? "Y" : "N";
    }

}