fix历史数据表；联锁基础表-普通列表

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/controller/InterlockBaseController.java

@@ -54,6 +54,15 @@ public class InterlockBaseController extends JeecgController<InterlockBase, IInt
 	@Autowired
 	private IInterlockBaseService interlockBaseService;
 
+	 /**
+	  * 联锁基础表-普通列表
+	  */
+	 @ApiOperation("联锁基础表-普通列表")
+	 @GetMapping(value = "/list")
+	 public List<InterlockBase> list(){
+	 	return interlockBaseService.list();
+	 }
+
 	/**查一二级树形结构*/
 	@ApiOperation("一二级树形结构")
 	@GetMapping(value = "/lever12")

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

@@ -208,16 +208,16 @@ public class InterlockDetailAddDTO {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
     /**创建日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
     /**所属部门*/

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

@@ -225,16 +225,16 @@ public class InterlockDetail implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
     /**创建日期*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @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")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
     /**所属部门*/

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockDetailHistory.java

@@ -48,6 +48,14 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "联锁条件值", width = 15)
     @ApiModelProperty(value = "联锁条件值")
     private java.lang.String interlockCondition;
+	/**联锁条件-设备id*/
+	@Excel(name = "联锁条件-设备id", width = 15)
+    @ApiModelProperty(value = "联锁条件-设备id")
+    private java.lang.String interlockConditionDeviceId;
+	/**联锁条件-模块名称*/
+	@Excel(name = "联锁条件-模块名称", width = 15)
+    @ApiModelProperty(value = "联锁条件-模块名称")
+    private java.lang.String interlockConditionModuleName;
 	/**联锁条件点位*/
 	@Excel(name = "联锁条件点位", width = 15)
     @ApiModelProperty(value = "联锁条件点位")
@@ -56,14 +64,24 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private java.lang.String description;
-	/**仪表状态(0正常1故障)*/
-	@Excel(name = "仪表状态(0正常1故障)", width = 15)
-    @ApiModelProperty(value = "仪表状态(0正常1故障)")
+    /**仪表状态（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)
-    @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;
+	/**仪表状态-设备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 = "仪表状态点位")
@@ -72,9 +90,17 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "仪表状态值", width = 15)
     @ApiModelProperty(value = "仪表状态值")
     private java.lang.String instrumentStatusValue;
-	/**原始模拟量位号*/
-	@Excel(name = "原始模拟量位号", width = 15)
-    @ApiModelProperty(value = "原始模拟量位号")
+	/**原始模拟-设备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)
@@ -100,34 +126,49 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "时间单位", width = 15)
     @ApiModelProperty(value = "时间单位")
     private java.lang.String thresholdTimeUnit;
-	/**控制系统状态(0正常1非正常)*/
-	@Excel(name = "控制系统状态(0正常1非正常)", width = 15)
-    @ApiModelProperty(value = "控制系统状态(0正常1非正常)")
+    /**控制系统状态（	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)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-	/**联锁设定值点位*/
-	@Excel(name = "联锁设定值点位", width = 15)
-    @ApiModelProperty(value = "联锁设定值点位")
-    private java.lang.String interlockSetTag;
 	/**当前值*/
 	@Excel(name = "当前值", width = 15)
     @ApiModelProperty(value = "当前值")
     private java.lang.String currentValue;
-	/**当前值位号*/
-	@Excel(name = "当前值位号", width = 15)
-    @ApiModelProperty(value = "当前值位号")
+	/**当前值-设备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, dicCode = "if_bypass")
+    @Dict(dicCode = "if_bypass")
+    @ApiModelProperty(value = "是否旁路（0否1是）")
     private java.lang.String ifBypass;
-	/**旁路状态*/
-	@Excel(name = "旁路状态", width = 15)
-    @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)
+    @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 = "旁路状态点位")
@@ -136,6 +177,14 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")
     private java.lang.String inputStatus;
+	/**输入卡件状态-设备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 = "输入卡件状态点位")
@@ -144,6 +193,14 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "输出卡件状态", width = 15)
     @ApiModelProperty(value = "输出卡件状态")
     private java.lang.String outputStatus;
+	/**输出卡件状态-设备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 = "输出卡件状态点位")
@@ -152,6 +209,14 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "MP状态", width = 15)
     @ApiModelProperty(value = "MP状态")
     private java.lang.String mpStatus;
+	/**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 = "状态点位")
@@ -160,16 +225,16 @@ public class InterlockDetailHistory implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @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")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/
@@ -179,4 +244,8 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+	/**点位当前时间*/
+	@Excel(name = "点位当前时间", width = 15)
+    @ApiModelProperty(value = "点位当前时间")
+    private java.lang.String tagTime;
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockSummaryHistory.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 联锁总历史数据表
  * @Author: jeecg-boot
- * @Date:   2024-05-30
+ * @Date:   2024-06-04
  * @Version: V1.0
  */
 @Data
@@ -51,6 +51,7 @@ public class InterlockSummaryHistory implements Serializable {
 	/**联锁状态(0未投用1投用)*/
 	@Excel(name = "联锁状态(0未投用1投用)", width = 15)
     @ApiModelProperty(value = "联锁状态(0未投用1投用)")
+    @Dict(dicCode = "interlock_status")
     private java.lang.String interlockStatus;
 	/**回路健康级别*/
 	@Excel(name = "回路健康级别", width = 15)
@@ -64,6 +65,14 @@ public class InterlockSummaryHistory implements Serializable {
 	@Excel(name = "联锁输出值", width = 15)
     @ApiModelProperty(value = "联锁输出值")
     private java.lang.String interlockOutValue;
+	/**联锁输出值-设备名称*/
+	@Excel(name = "联锁输出值-设备名称", width = 15)
+    @ApiModelProperty(value = "联锁输出值-设备名称")
+    private java.lang.String deviceId;
+	/**联锁输出值-装置名称*/
+	@Excel(name = "联锁输出值-装置名称", width = 15)
+    @ApiModelProperty(value = "联锁输出值-装置名称")
+    private java.lang.String moduleName;
 	/**联锁输出值点位*/
 	@Excel(name = "联锁输出值点位", width = 15)
     @ApiModelProperty(value = "联锁输出值点位")
@@ -72,16 +81,16 @@ public class InterlockSummaryHistory implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @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")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**备注*/
@@ -91,4 +100,8 @@ public class InterlockSummaryHistory implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+	/**点位当前时间*/
+	@Excel(name = "点位当前时间", width = 15)
+    @ApiModelProperty(value = "点位当前时间")
+    private java.lang.String tagTime;
 }