fix联锁详细信息字段

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

@@ -1,9 +1,13 @@
 package org.jeecg.modules.detail.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 功能描述
@@ -13,6 +17,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 @Data
 public class InterlockDetailAddDTO {
+    private static final long serialVersionUID = 1L;
 
     /**联锁总表id*/
     @Excel(name = "联锁总表id", width = 15)
@@ -22,6 +27,10 @@ public class InterlockDetailAddDTO {
     @Excel(name = "联锁名称", width = 15)
     @ApiModelProperty(value = "联锁名称")
     private java.lang.String interlockname;
+    /**联锁条件值*/
+    @Excel(name = "联锁条件值", width = 15)
+    @ApiModelProperty(value = "联锁条件值")
+    private java.lang.String interlockCondition;
     /**联锁条件-设备id*/
     @Excel(name = "联锁条件-设备id", width = 15)
     @ApiModelProperty(value = "联锁条件-设备id")
@@ -34,23 +43,19 @@ public class InterlockDetailAddDTO {
     @Excel(name = "联锁条件点位", width = 15)
     @ApiModelProperty(value = "联锁条件点位")
     private java.lang.String interlockConditionTag;
-    /**联锁条件值*/
-    @Excel(name = "联锁条件值", width = 15)
-    @ApiModelProperty(value = "联锁条件值")
-    private java.lang.String interlockCondition;
-    /**描述*/
-    @Excel(name = "描述", width = 15)
-    @ApiModelProperty(value = "描述")
+    /**描述。*/
+    @Excel(name = "描述。", width = 15)
+    @ApiModelProperty(value = "描述。")
     private java.lang.String description;
-    /**仪表状态*/
-    @Excel(name = "仪表状态", width = 15)
-    @ApiModelProperty(value = "仪表状态")
+    /**仪表状态（0正常1故障）*/
+    @Excel(name = "仪表状态（0正常1故障）", width = 15, dicCode = "instrument_status")
     @Dict(dicCode = "instrument_status")
+    @ApiModelProperty(value = "仪表状态（0正常1故障）")
     private java.lang.String instrumentStatus;
-    /**仪表状态判断方式*/
-    @Excel(name = "仪表状态判断方式", width = 15, dicCode = "instrument_status_juge")
+    /**仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）*/
+    @Excel(name = "仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）", width = 15, dicCode = "instrument_status_juge")
     @Dict(dicCode = "instrument_status_juge")
-    @ApiModelProperty(value = "仪表状态判断方式")
+    @ApiModelProperty(value = "仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）")
     private java.lang.String instrumentStatusJuge;
     /**仪表状态-设备id*/
     @Excel(name = "仪表状态-设备id", width = 15)
@@ -68,10 +73,9 @@ public class InterlockDetailAddDTO {
     @Excel(name = "仪表状态值", width = 15)
     @ApiModelProperty(value = "仪表状态值")
     private java.lang.String instrumentStatusValue;
-
-    /**原始模拟量-设备id*/
-    @Excel(name = "原始模拟量-设备id", width = 15)
-    @ApiModelProperty(value = "原始模拟量-设备id")
+    /**原始模拟-设备id*/
+    @Excel(name = "原始模拟-设备id", width = 15)
+    @ApiModelProperty(value = "原始模拟-设备id")
     private java.lang.String ysmnlDeviceId;
     /**原始模拟量-模块名称*/
     @Excel(name = "原始模拟量-模块名称", width = 15)
@@ -105,10 +109,10 @@ public class InterlockDetailAddDTO {
     @Excel(name = "时间单位", width = 15)
     @ApiModelProperty(value = "时间单位")
     private java.lang.String thresholdTimeUnit;
-    /**控制系统状态*/
-    @Excel(name = "控制系统状态", width = 15)
-    @ApiModelProperty(value = "控制系统状态")
+    /**控制系统状态（	0正常1非正常）*/
+    @Excel(name = "控制系统状态（	0正常1非正常）", width = 15, dicCode = "control_system_status")
     @Dict(dicCode = "control_system_status")
+    @ApiModelProperty(value = "控制系统状态（	0正常1非正常）")
     private java.lang.String controlSystemStatus;
     /**联锁设定值*/
     @Excel(name = "联锁设定值", width = 15)
@@ -130,13 +134,15 @@ public class InterlockDetailAddDTO {
     @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, dicCode = "if_bypass")
+    @Dict(dicCode = "if_bypass")
+    @ApiModelProperty(value = "是否旁路（0否1是）")
     private java.lang.String ifBypass;
-    /**旁路状态*/
-    @ApiModelProperty(value = "旁路状态")
+    /**旁路状态（0否1是）*/
+    @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态（0否1是）")
     private java.lang.String bypass;
     /**旁路状态-设备id*/
     @Excel(name = "旁路状态-设备id", width = 15)
@@ -150,7 +156,6 @@ public class InterlockDetailAddDTO {
     @Excel(name = "旁路状态点位", width = 15)
     @ApiModelProperty(value = "旁路状态点位")
     private java.lang.String bypassTag;
-
     /**输入卡件状态*/
     @Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")
@@ -195,8 +200,31 @@ public class InterlockDetailAddDTO {
     @Excel(name = "MP状态-模块名称", width = 15)
     @ApiModelProperty(value = "MP状态-模块名称")
     private java.lang.String mpStatusModuleName;
-    /**MP状态点位*/
-    @Excel(name = "MP状态点位", width = 15)
-    @ApiModelProperty(value = "MP状态点位")
+    /**状态点位*/
+    @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")
+    @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")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
 }

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

@@ -51,11 +51,11 @@ public class InterlockDetail implements Serializable {
     /**联锁条件-设备id*/
     @Excel(name = "联锁条件-设备id", width = 15)
     @ApiModelProperty(value = "联锁条件-设备id")
-    private java.lang.String interlockDeviceId;
+    private java.lang.String interlockConditionDeviceId;
     /**联锁条件-模块名称*/
     @Excel(name = "联锁条件-模块名称", width = 15)
     @ApiModelProperty(value = "联锁条件-模块名称")
-    private java.lang.String interlockModuleName;
+    private java.lang.String interlockConditionModuleName;
     /**联锁条件点位*/
     @Excel(name = "联锁条件点位", width = 15)
     @ApiModelProperty(value = "联锁条件点位")
@@ -65,7 +65,8 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "描述。")
     private java.lang.String description;
     /**仪表状态（0正常1故障）*/
-    @Excel(name = "仪表状态（0正常1故障）", width = 15)
+    @Excel(name = "仪表状态（0正常1故障）", width = 15, dicCode = "instrument_status")
+    @Dict(dicCode = "instrument_status")
     @ApiModelProperty(value = "仪表状态（0正常1故障）")
     private java.lang.String instrumentStatus;
     /**仪表状态判断方式（0直接读取位号1高低限判断2突变超限判断）*/
@@ -126,7 +127,8 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "时间单位")
     private java.lang.String thresholdTimeUnit;
     /**控制系统状态（	0正常1非正常）*/
-    @Excel(name = "控制系统状态（	0正常1非正常）", width = 15)
+    @Excel(name = "控制系统状态（	0正常1非正常）", width = 15, dicCode = "control_system_status")
+    @Dict(dicCode = "control_system_status")
     @ApiModelProperty(value = "控制系统状态（	0正常1非正常）")
     private java.lang.String controlSystemStatus;
     /**联锁设定值*/
@@ -150,11 +152,13 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "当前值点位")
     private java.lang.String currentValueTag;
     /**是否旁路（0否1是）*/
-    @Excel(name = "是否旁路（0否1是）", width = 15)
+    @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
+    @Dict(dicCode = "if_bypass")
     @ApiModelProperty(value = "是否旁路（0否1是）")
     private java.lang.String ifBypass;
     /**旁路状态（0否1是）*/
-    @Excel(name = "旁路状态（0否1是）", width = 15)
+    @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
+    @Dict(dicCode = "bypass")
     @ApiModelProperty(value = "旁路状态（0否1是）")
     private java.lang.String bypass;
     /**旁路状态-设备id*/
@@ -221,7 +225,7 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
     /**创建日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
@@ -229,7 +233,7 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
     /**更新日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;