fix联锁详细信息字段

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/dto/InterlockDetailAddDTO.java

@@ -114,18 +114,6 @@ public class InterlockDetailAddDTO {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-//    /**联锁设定值-设备id*/
-//    @Excel(name = "联锁设定值-设备id", width = 15)
-//    @ApiModelProperty(value = "联锁设定值-设备id")
-//    private java.lang.String interlockSetDeviceId;
-//    /**联锁设定值-模块名称*/
-//    @Excel(name = "联锁设定值-模块名称", width = 15)
-//    @ApiModelProperty(value = "联锁设定值-模块名称")
-//    private java.lang.String interlockSetModuleName;
-//    /**联锁设定值点位*/
-//    @Excel(name = "联锁设定值点位", width = 15)
-//    @ApiModelProperty(value = "联锁设定值点位")
-//    private java.lang.String interlockSetTag;
     /**当前值*/
     @Excel(name = "当前值", width = 15)
     @ApiModelProperty(value = "当前值")

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/entity/InterlockDetail.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
  * @Date:   2024-05-23
- * @Version: V1.0
+ * @Version: V2.0
  */
 @Data
 @TableName("interlock_detail")
@@ -32,153 +32,212 @@ import lombok.experimental.Accessors;
 public class InterlockDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**联锁总表id*/
-	@Excel(name = "联锁总表id", width = 15)
+    /**联锁总表id*/
+    @Excel(name = "联锁总表id", width = 15)
     @ApiModelProperty(value = "联锁总表id")
     private java.lang.String summaryid;
-	/**联锁名称*/
-	@Excel(name = "联锁名称", width = 15)
+    /**联锁名称*/
+    @Excel(name = "联锁名称", width = 15)
     @ApiModelProperty(value = "联锁名称")
     private java.lang.String interlockname;
-	/**联锁条件值*/
-	@Excel(name = "联锁条件值", width = 15)
+    /**联锁条件值*/
+    @Excel(name = "联锁条件值", width = 15)
     @ApiModelProperty(value = "联锁条件值")
     private java.lang.String interlockCondition;
-	/**联锁条件点位*/
-	@Excel(name = "联锁条件点位", width = 15)
+    /**联锁条件-设备id*/
+    @Excel(name = "联锁条件-设备id", width = 15)
+    @ApiModelProperty(value = "联锁条件-设备id")
+    private java.lang.String interlockDeviceId;
+    /**联锁条件-模块名称*/
+    @Excel(name = "联锁条件-模块名称", width = 15)
+    @ApiModelProperty(value = "联锁条件-模块名称")
+    private java.lang.String interlockModuleName;
+    /**联锁条件点位*/
+    @Excel(name = "联锁条件点位", width = 15)
     @ApiModelProperty(value = "联锁条件点位")
     private java.lang.String interlockConditionTag;
-	/**描述*/
-	@Excel(name = "描述", width = 15)
-    @ApiModelProperty(value = "描述")
+    /**描述。*/
+    @Excel(name = "描述。", width = 15)
+    @ApiModelProperty(value = "描述。")
     private java.lang.String description;
-	/**仪表状态*/
-	@Excel(name = "仪表状态", width = 15)
-    @ApiModelProperty(value = "仪表状态")
-    @Dict(dicCode = "instrument_status")
+    /**仪表状态（0正常1故障）*/
+    @Excel(name = "仪表状态（0正常1故障）", width = 15)
+    @ApiModelProperty(value = "仪表状态（0正常1故障）")
     private java.lang.String instrumentStatus;
-	/**仪表状态判断方式*/
-	@Excel(name = "仪表状态判断方式", width = 15, dicCode = "instrument_status_juge")
-	@Dict(dicCode = "instrument_status_juge")
-    @ApiModelProperty(value = "仪表状态判断方式")
+    /**仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）*/
+    @Excel(name = "仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）", width = 15, dicCode = "instrument_status_juge")
+    @Dict(dicCode = "instrument_status_juge")
+    @ApiModelProperty(value = "仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）")
     private java.lang.String instrumentStatusJuge;
-	/**仪表状态点位*/
-	@Excel(name = "仪表状态点位", width = 15)
+    /**仪表状态-设备id*/
+    @Excel(name = "仪表状态-设备id", width = 15)
+    @ApiModelProperty(value = "仪表状态-设备id")
+    private java.lang.String instrumentStatusDeviceId;
+    /**仪表状态-模块名称*/
+    @Excel(name = "仪表状态-模块名称", width = 15)
+    @ApiModelProperty(value = "仪表状态-模块名称")
+    private java.lang.String instrumentStatusModuleName;
+    /**仪表状态点位*/
+    @Excel(name = "仪表状态点位", width = 15)
     @ApiModelProperty(value = "仪表状态点位")
     private java.lang.String instrumentStatusTag;
-	/**仪表状态值*/
-	@Excel(name = "仪表状态值", width = 15)
+    /**仪表状态值*/
+    @Excel(name = "仪表状态值", width = 15)
     @ApiModelProperty(value = "仪表状态值")
     private java.lang.String instrumentStatusValue;
-	/**原始模拟量点位*/
-	@Excel(name = "原始模拟量点位", width = 15)
+    /**原始模拟-设备id*/
+    @Excel(name = "原始模拟-设备id", width = 15)
+    @ApiModelProperty(value = "原始模拟-设备id")
+    private java.lang.String ysmnlDeviceId;
+    /**原始模拟量-模块名称*/
+    @Excel(name = "原始模拟量-模块名称", width = 15)
+    @ApiModelProperty(value = "原始模拟量-模块名称")
+    private java.lang.String ysmnlModuleName;
+    /**原始模拟量点位*/
+    @Excel(name = "原始模拟量点位", width = 15)
     @ApiModelProperty(value = "原始模拟量点位")
     private java.lang.String ysmnlTag;
-	/**原始模拟量值*/
-	@Excel(name = "原始模拟量值", width = 15)
+    /**原始模拟量值*/
+    @Excel(name = "原始模拟量值", width = 15)
     @ApiModelProperty(value = "原始模拟量值")
     private java.lang.String ysmnlValue;
-	/**高限*/
-	@Excel(name = "高限", width = 15)
+    /**高限*/
+    @Excel(name = "高限", width = 15)
     @ApiModelProperty(value = "高限")
     private java.lang.String upperLimit;
-	/**低限*/
-	@Excel(name = "低限", width = 15)
+    /**低限*/
+    @Excel(name = "低限", width = 15)
     @ApiModelProperty(value = "低限")
     private java.lang.String lowerLimit;
-	/**阈值*/
-	@Excel(name = "阈值", width = 15)
+    /**阈值*/
+    @Excel(name = "阈值", width = 15)
     @ApiModelProperty(value = "阈值")
     private java.lang.String thresholdValue;
-	/**时间*/
-	@Excel(name = "时间", width = 15)
+    /**时间*/
+    @Excel(name = "时间", width = 15)
     @ApiModelProperty(value = "时间")
     private java.lang.String thresholdTime;
-	/**时间单位*/
-	@Excel(name = "时间单位", width = 15)
+    /**时间单位*/
+    @Excel(name = "时间单位", width = 15)
     @ApiModelProperty(value = "时间单位")
     private java.lang.String thresholdTimeUnit;
-    /**控制系统状态*/
-    @Excel(name = "控制系统状态", width = 15)
-    @ApiModelProperty(value = "控制系统状态")
-    @Dict(dicCode = "control_system_status")
+    /**控制系统状态（	0正常1非正常）*/
+    @Excel(name = "控制系统状态（	0正常1非正常）", width = 15)
+    @ApiModelProperty(value = "控制系统状态（	0正常1非正常）")
     private java.lang.String controlSystemStatus;
-	/**联锁设定值*/
-	@Excel(name = "联锁设定值", width = 15)
+    /**联锁设定值*/
+    @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-	/**联锁设定值点位*/
-	@Excel(name = "联锁设定值点位", width = 15)
-    @ApiModelProperty(value = "联锁设定值点位")
-    private java.lang.String interlockSetTag;
-	/**当前值*/
-	@Excel(name = "当前值", width = 15)
+    /**当前值*/
+    @Excel(name = "当前值", width = 15)
     @ApiModelProperty(value = "当前值")
     private java.lang.String currentValue;
-	/**当前值点位*/
-	@Excel(name = "当前值点位", width = 15)
+    /**当前值-设备id*/
+    @Excel(name = "当前值-设备id", width = 15)
+    @ApiModelProperty(value = "当前值-设备id")
+    private java.lang.String currentValueDeviceId;
+    /**当前值-模块名称*/
+    @Excel(name = "当前值-模块名称", width = 15)
+    @ApiModelProperty(value = "当前值-模块名称")
+    private java.lang.String currentValueModuleName;
+    /**当前值点位*/
+    @Excel(name = "当前值点位", width = 15)
     @ApiModelProperty(value = "当前值点位")
     private java.lang.String currentValueTag;
-	/**是否旁路*/
-	@Excel(name = "是否旁路", width = 15)
-    @ApiModelProperty(value = "是否旁路")
+    /**是否旁路（0否1是）*/
+    @Excel(name = "是否旁路（0否1是）", width = 15)
+    @ApiModelProperty(value = "是否旁路（0否1是）")
     private java.lang.String ifBypass;
-    /**旁路状态*/
-    @ApiModelProperty(value = "旁路状态")
+    /**旁路状态（0否1是）*/
+    @Excel(name = "旁路状态（0否1是）", width = 15)
+    @ApiModelProperty(value = "旁路状态（0否1是）")
     private java.lang.String bypass;
+    /**旁路状态-设备id*/
+    @Excel(name = "旁路状态-设备id", width = 15)
+    @ApiModelProperty(value = "旁路状态-设备id")
+    private java.lang.String bypassDeviceId;
+    /**旁路状态-模块名称*/
+    @Excel(name = "旁路状态-模块名称", width = 15)
+    @ApiModelProperty(value = "旁路状态-模块名称")
+    private java.lang.String bypassModuleName;
     /**旁路状态点位*/
     @Excel(name = "旁路状态点位", width = 15)
     @ApiModelProperty(value = "旁路状态点位")
     private java.lang.String bypassTag;
-	/**输入卡件状态*/
-	@Excel(name = "输入卡件状态", width = 15)
+    /**输入卡件状态*/
+    @Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")
     private java.lang.String inputStatus;
-	/**输入卡件状态点位*/
-	@Excel(name = "输入卡件状态点位", width = 15)
+    /**输入卡件状态-设备id*/
+    @Excel(name = "输入卡件状态-设备id", width = 15)
+    @ApiModelProperty(value = "输入卡件状态-设备id")
+    private java.lang.String inputStatusDeviceId;
+    /**输入卡件状态-模块名称*/
+    @Excel(name = "输入卡件状态-模块名称", width = 15)
+    @ApiModelProperty(value = "输入卡件状态-模块名称")
+    private java.lang.String inputStatusModuleName;
+    /**输入卡件状态点位*/
+    @Excel(name = "输入卡件状态点位", width = 15)
     @ApiModelProperty(value = "输入卡件状态点位")
     private java.lang.String inputStatusTag;
-	/**输出卡件状态*/
-	@Excel(name = "输出卡件状态", width = 15)
+    /**输出卡件状态*/
+    @Excel(name = "输出卡件状态", width = 15)
     @ApiModelProperty(value = "输出卡件状态")
     private java.lang.String outputStatus;
-	/**输出卡件状态点位*/
-	@Excel(name = "输出卡件状态点位", width = 15)
+    /**输出卡件状态-设备id*/
+    @Excel(name = "输出卡件状态-设备id", width = 15)
+    @ApiModelProperty(value = "输出卡件状态-设备id")
+    private java.lang.String outputStatusDeviceId;
+    /**输出卡件状态-模块名称*/
+    @Excel(name = "输出卡件状态-模块名称", width = 15)
+    @ApiModelProperty(value = "输出卡件状态-模块名称")
+    private java.lang.String outputStatusModuleName;
+    /**输出卡件状态点位*/
+    @Excel(name = "输出卡件状态点位", width = 15)
     @ApiModelProperty(value = "输出卡件状态点位")
     private java.lang.String outputStatusTag;
-	/**MP状态*/
-	@Excel(name = "MP状态", width = 15)
+    /**MP状态*/
+    @Excel(name = "MP状态", width = 15)
     @ApiModelProperty(value = "MP状态")
     private java.lang.String mpStatus;
-	/**MP状态点位*/
-	@Excel(name = "MP状态点位", width = 15)
-    @ApiModelProperty(value = "MP状态点位")
+    /**MP状态-设备id*/
+    @Excel(name = "MP状态-设备id", width = 15)
+    @ApiModelProperty(value = "MP状态-设备id")
+    private java.lang.String mpStatusDeviceId;
+    /**MP状态-模块名称*/
+    @Excel(name = "MP状态-模块名称", width = 15)
+    @ApiModelProperty(value = "MP状态-模块名称")
+    private java.lang.String mpStatusModuleName;
+    /**状态点位*/
+    @Excel(name = "状态点位", width = 15)
+    @ApiModelProperty(value = "状态点位")
     private java.lang.String mpStatusTag;
-	/**创建人*/
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
+    /**备注*/
+    @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 }