Browse Source

fix InterlockBase

LLL 11 months ago
parent
commit
35bed111a5

+ 26 - 1
jeecg-module-interlock/src/main/java/org/jeecg/modules/base/entity/InterlockBase.java

@@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   2024-05-22
  * @Version: V1.0
  */
-@Data////
+@Data
 @TableName("interlock_base")
 @ApiModel(value="interlock_base对象", description="联锁基础表")
 public class InterlockBase implements Serializable {
@@ -70,30 +70,55 @@ public class InterlockBase implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 
+
     /**输入卡件状态-正常*/
     @Excel(name = "输入卡件状态-正常", width = 15)
     @ApiModelProperty(value = "输入卡件状态-正常")
     @Dict(dicCode = "input_status_normal")
     private java.lang.String inputStatusNormal;
+    private java.lang.String inputStatusNormalName;
+    private java.lang.String inputStatusAbnormalName;
     /**输出卡件状态-正常*/
     @Excel(name = "输出卡件状态-正常", width = 15)
     @ApiModelProperty(value = "输出卡件状态-正常")
     @Dict(dicCode = "output_status_normal")
     private java.lang.String outputStatusNormal;
+    private java.lang.String outputStatusNormalName;
+    private java.lang.String outputStatusAbnormalName;
     /**MP状态-正常*/
     @Excel(name = "MP状态-正常", width = 15)
     @ApiModelProperty(value = "MP状态-正常")
     @Dict(dicCode = "mp_status_normal")
     private java.lang.String mpStatusNormal;
+    private java.lang.String mpStatusNormalName;
+    private java.lang.String mpStatusAbnormalName;
+
+    /**控制系统状态-正常*/
+    @Excel(name = "控制系统状态-正常", width = 15)
+    @ApiModelProperty(value = "控制系统状态-正常")
+    @Dict(dicCode = "control_system_status")
+    private java.lang.String controlSystemStatusNormal;
+    private java.lang.String controlSystemStatusNormalName;
+    private java.lang.String controlSystemStatusAbnormalName;
     /**旁路状态-是*/
     @Excel(name = "旁路状态-是", width = 15)
     @ApiModelProperty(value = "旁路状态-是")
     @Dict(dicCode = "bypass_yes")
     private java.lang.String bypassYes;
+    private java.lang.String bypassYesName;
+    private java.lang.String bypassNoName;
     /**仪表状态-正常*/
     @Excel(name = "仪表状态-正常", width = 15)
     @ApiModelProperty(value = "仪表状态-正常")
     @Dict(dicCode = "instrument_status_normal")
     private java.lang.String instrumentStatusNormal;
+    private java.lang.String instrumentStatusNormalName;
+    private java.lang.String instrumentStatusAbnormalName;
+    /**联锁状态-正常*/
+    @Excel(name = "联锁状态-正常", width = 15)
+    @ApiModelProperty(value = "联锁状态-正常")
+    private java.lang.String interlockStatusNormal;
+    private java.lang.String interlockStatusNormalName;
+    private java.lang.String interlockStatusAbnormalName;
 
 }