#

Junjie

2025-03-13 43d1680b17baad487839ee6d025e969a5b760749

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;

import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -72,152 +73,22 @@
    private Boolean pakMk;

    /**
     * 提升机锁定
     * 设备状态
     */
    @ApiModelProperty(value= "提升机锁定")
    @TableField("lift_lock")
    private Boolean liftLock;
    @ApiModelProperty(value= "设备状态")
    @TableField("device_status")
    private String deviceStatus;

    /**
     * 位置到达反馈
     * 提升机坐标
     */
    @ApiModelProperty(value= "位置到达反馈")
    @TableField("position_arrival_feedback")
    private Integer positionArrivalFeedback;

    /**
     * 准备就绪
     */
    @ApiModelProperty(value= "准备就绪")
    private Boolean ready;

    /**
     * 运行中
     */
    @ApiModelProperty(value= "运行中")
    private Boolean running;

    /**
     * 联机/单机
     */
    @ApiModelProperty(value= "联机/单机")
    private Boolean mode;

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

    /**
     * 输送线正转反馈
     */
    @ApiModelProperty(value= "输送线正转反馈")
    @TableField("forward_rotation_feedback")
    private Boolean forwardRotationFeedback;

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

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

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

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

    /**
     * 出输送线卡托盘报警
     */
    @ApiModelProperty(value= "出输送线卡托盘报警")
    @TableField("out_convey_line_card_tray_alarm")
    private Boolean outConveyLineCardTrayAlarm;

    /**
     * 平台位置偏差报警
     */
    @ApiModelProperty(value= "平台位置偏差报警")
    @TableField("plat_position_deviation_alarm")
    private Boolean platPositionDeviationAlarm;

    /**
     * 平台扭矩偏差报警
     */
    @ApiModelProperty(value= "平台扭矩偏差报警")
    @TableField("plat_torque_deviation_alarm")
    private Boolean platTorqueDeviationAlarm;

    /**
     * 平台四向车检测
     */
    @ApiModelProperty(value= "平台四向车检测")
    @TableField("plat_shuttle_check")
    private Boolean platShuttleCheck;

    /**
     * 未就绪状态
     */
    @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("point")
    private String point;

    public BasLift() {}

    public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Boolean pakMk,Boolean liftLock,Integer positionArrivalFeedback,Boolean ready,Boolean running,Boolean mode,Boolean lineFrontHasStock,Boolean forwardRotationFeedback,Boolean reverseFeedback,Boolean motorOverload,Boolean lineEndHasStock,Boolean inConveyLineCardTrayAlarm,Boolean outConveyLineCardTrayAlarm,Boolean platPositionDeviationAlarm,Boolean platTorqueDeviationAlarm,Boolean 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, Boolean pakMk, String deviceStatus) {
        this.liftNo = liftNo;
        this.status = status;
        this.wrkNo = wrkNo;
@@ -225,59 +96,8 @@
        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.deviceStatus = deviceStatus;
    }

//    BasLift basLift = new BasLift(
//            null,    // 提升机号[非空]
//            null,    // 当前提升机状态
//            null,    // 任务号
//            null,    // 修改时间
//            null,    // 修改人员
//            null,    // 备注
//            null,    // 作业标记
//            null,    // 提升机锁定
//            null,    // 位置到达反馈
//            null,    // 准备就绪
//            null,    // 运行中
//            null,    // 联机/单机
//            null,    // 输送线前端光电有货
//            null,    // 输送线正转反馈
//            null,    // 输送线反转反馈
//            null,    // 输送线电机过载
//            null,    // 输送线末端光电有货
//            null,    // 进输送线卡托盘报警
//            null,    // 出输送线卡托盘报警
//            null,    // 平台位置偏差报警
//            null,    // 平台扭矩偏差报警
//            null,    // 平台四向车检测
//            null,    // 未就绪状态
//            null,    // 伺服1错误
//            null,    // 伺服2错误
//            null,    // 伺服3错误
//            null,    // 伺服4错误
//            null    // 提升机实际速度反馈
//    );

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
@@ -294,6 +114,5 @@
        }
        return null;
    }


}