#配置信号

1

3 天以前 82374fe4b32d58956810f445b7889f1a370f1ab9

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

@@ -1,11 +1,11 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,9 +17,7 @@
public class BasDevpErrorLog implements Serializable {

    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 输送编号
     */
@@ -152,13 +150,169 @@
    @TableField("out_enable")
    private String outEnable;

    /**
     * 数据错误
     */
    @ApiModelProperty(value= "数据错误")
    @TableField("data_error")
    private String dataError;

    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * 直线光电
     */
    @ApiModelProperty(value= "直线光电")
    @TableField("sensorG_arrive")
    private String sensorGArrive;

    /**
     * 减速光电
     */
    @ApiModelProperty(value= "减速光电")
    @TableField("sensorG_dec")
    private String sensorGDec;

    /**
     * 直线凸出
     */
    @ApiModelProperty(value= "直线凸出")
    @TableField("sensorG_arrive2")
    private String sensorGArrive2;

    /**
     * 限位保护光电
     */
    @ApiModelProperty(value= "限位保护光电")
    @TableField("sensor_limit")
    private String sensorLimit;

    /**
     * 急停
     */
    @ApiModelProperty(value= "急停")
    private String emergency;

    /**
     * 光电离开1
     */
    @ApiModelProperty(value= "光电离开1")
    @TableField("sensorG_leave")
    private String sensorGLeave;

    /**
     * 光电离开2
     */
    @ApiModelProperty(value= "光电离开2")
    @TableField("sensorG_leave2")
    private String sensorGLeave2;

    /**
     * 顶升上升
     */
    @ApiModelProperty(value= "顶升上升")
    @TableField("sensorC_up")
    private String sensorCUp;

    /**
     * 顶升下降
     */
    @ApiModelProperty(value= "顶升下降")
    @TableField("sensorC_down")
    private String sensorCDown;

    /**
     * 顶升热继
     */
    @ApiModelProperty(value= "顶升热继")
    @TableField("lift_motor_fr")
    private String liftMotorFr;

    /**
     * 直线热继
     */
    @ApiModelProperty(value= "直线热继")
    @TableField("line_motor_fr")
    private String lineMotorFr;

    /**
     * 移栽热继
     */
    @ApiModelProperty(value= "移栽热继")
    @TableField("tran_motor_fr")
    private String tranMotorFr;

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String rst1;

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private String rst2;

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String rst3;

    /**
     * 备用4
     */
    @ApiModelProperty(value= "备用4")
    private String rst4;

    /**
     * 直行方向到位
     */
    @ApiModelProperty(value= "直行方向到位")
    @TableField("sensor_arrive_d")
    private String sensorArriveD;

    /**
     * 直行方向减速
     */
    @ApiModelProperty(value= "直行方向减速")
    @TableField("sensor_dec_d")
    private String sensorDecD;

    /**
     * 左移方向到位
     */
    @ApiModelProperty(value= "左移方向到位")
    @TableField("sensor_arrive_l")
    private String sensorArriveL;

    /**
     * 左移方向减速
     */
    @ApiModelProperty(value= "左移方向减速")
    @TableField("sensor_dec_l")
    private String sensorDecL;

    /**
     * 右移方向到位
     */
    @ApiModelProperty(value= "右移方向到位")
    @TableField("sensor_arrive_r")
    private String sensorArriveR;

    /**
     * 右移方向减速
     */
    @ApiModelProperty(value= "右移方向减速")
    @TableField("sensor_dec_r")
    private String sensorDecR;

    public BasDevpErrorLog() {}

    public BasDevpErrorLog(Integer devNo,String passTimeOut,String objectNoIdError,String idNoObjectError,String lmfrError,String liftError,String dlfrError,String dmfrError,String vfdError,String srvError,String res1,String res2,String res3,String communicationTimeOut,String parameterIncompleteError,String dataNotClear,String setParameterError,Date createTime,String inEnable,String outEnable,String dataError) {
    public BasDevpErrorLog(Integer devNo,String passTimeOut,String objectNoIdError,String idNoObjectError,String lmfrError,String liftError,String dlfrError,String dmfrError,String vfdError,String srvError,String res1,String res2,String res3,String communicationTimeOut,String parameterIncompleteError,String dataNotClear,String setParameterError,Date createTime,String inEnable,String outEnable,String dataError,String sensorGArrive,String sensorGDec,String sensorGArrive2,String sensorLimit,String emergency,String sensorGLeave,String sensorGLeave2,String sensorCUp,String sensorCDown,String liftMotorFr,String lineMotorFr,String tranMotorFr,String rst1,String rst2,String rst3,String rst4,String sensorArriveD,String sensorDecD,String sensorArriveL,String sensorDecL,String sensorArriveR,String sensorDecR) {
        this.devNo = devNo;
        this.passTimeOut = passTimeOut;
        this.objectNoIdError = objectNoIdError;
@@ -180,6 +334,28 @@
        this.inEnable = inEnable;
        this.outEnable = outEnable;
        this.dataError = dataError;
        this.sensorGArrive = sensorGArrive;
        this.sensorGDec = sensorGDec;
        this.sensorGArrive2 = sensorGArrive2;
        this.sensorLimit = sensorLimit;
        this.emergency = emergency;
        this.sensorGLeave = sensorGLeave;
        this.sensorGLeave2 = sensorGLeave2;
        this.sensorCUp = sensorCUp;
        this.sensorCDown = sensorCDown;
        this.liftMotorFr = liftMotorFr;
        this.lineMotorFr = lineMotorFr;
        this.tranMotorFr = tranMotorFr;
        this.rst1 = rst1;
        this.rst2 = rst2;
        this.rst3 = rst3;
        this.rst4 = rst4;
        this.sensorArriveD = sensorArriveD;
        this.sensorDecD = sensorDecD;
        this.sensorArriveL = sensorArriveL;
        this.sensorDecL = sensorDecL;
        this.sensorArriveR = sensorArriveR;
        this.sensorDecR = sensorDecR;
    }

//    BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog(
@@ -203,7 +379,29 @@
//            null,    // 创建时间
//            null,    // 
//            null,    // 
//            null    // 
//            null,    // 数据错误
//            null,    // 直线光电
//            null,    // 减速光电
//            null,    // 直线凸出
//            null,    // 限位保护光电
//            null,    // 急停
//            null,    // 光电离开1
//            null,    // 光电离开2
//            null,    // 顶升上升
//            null,    // 顶升下降
//            null,    // 顶升热继
//            null,    // 直线热继
//            null,    // 移栽热继
//            null,    // 备用1
//            null,    // 备用2
//            null,    // 备用3
//            null,    // 备用4
//            null,    // 直行方向到位
//            null,    // 直行方向减速
//            null,    // 左移方向到位
//            null,    // 左移方向减速
//            null,    // 右移方向到位
//            null    // 右移方向减速
//    );

    public String getCreateTime$(){