历史数据总表、历史数据详细信息表加上原联锁总表id字段

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

@@ -236,4 +236,8 @@ public class InterlockDetailHistory implements Serializable {
     @Excel(name = "系统id", width = 15)
     @ApiModelProperty(value = "系统id")
     private java.lang.String interlockSystemId;
+    /**该联锁在原联锁总表的id*/
+    @Excel(name = "该联锁在原联锁总表的id", width = 15)
+    @ApiModelProperty(value = "该联锁在原联锁总表的id")
+    private java.lang.String summaryOriginId;
 }

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

@@ -104,4 +104,8 @@ public class InterlockSummaryHistory implements Serializable {
 	@Excel(name = "点位当前时间", width = 15)
     @ApiModelProperty(value = "点位当前时间")
     private java.lang.String tagTime;
+    /**该联锁在原联锁总表的id*/
+    @Excel(name = "该联锁在原联锁总表的id", width = 15)
+    @ApiModelProperty(value = "该联锁在原联锁总表的id")
+    private java.lang.String summaryOriginId;
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -6,7 +6,7 @@
     <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,
         d.instrument_status, d.interlock_set_value, d.current_value, d.if_bypass, d.input_status, d.output_status,
-        d.mp_status, s.ljgx, s.interlock_out_value
+        d.mp_status, s.ljgx, s.interlock_out_value, s.tag_time, d.summary_origin_id
         from interlock_detail_history d left join interlock_summary_history s on d.summaryid = s.id
         <where>
             <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>
@@ -18,7 +18,7 @@
     <!-- 联锁总历史数据表-分页列表查询（各种逻辑状态）-->
     <select id="getPage" parameterType="org.jeecg.modules.history.dto.InterlockHistoryQueryDTO" resultType="org.jeecg.modules.history.vo.InterlockSummaryHistoryVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.instrument_status, d.control_system_status,
-        s.interlock_status, s.loop_health_level, d.bypass, s.tag_time
+        s.interlock_status, s.loop_health_level, d.bypass, s.tag_time, d.summary_origin_id
         from interlock_detail_history d left join interlock_summary_history s on d.summaryid = s.id
         <where>
             <if test="dto.interlockSystemId != null and dto.interlockSystemId != ''"> and s.interlock_system_id =  #{dto.interlockSystemId}</if>

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockDetailHistoryQueryVO.java

@@ -76,4 +76,14 @@ public class InterlockDetailHistoryQueryVO {
     @ApiModelProperty(value = "联锁输出值")
     private java.lang.String interlockOutValue;
 
+
+    /**采集时间*/
+    @Excel(name = "采集时间", width = 30, mergeVertical = true)
+    @ApiModelProperty(value = "采集时间")
+    private java.lang.String tagTime;
+    /**该联锁在原联锁总表的id*/
+    @Excel(name = "该联锁在原联锁总表的id", width = 15)
+    @ApiModelProperty(value = "该联锁在原联锁总表的id")
+    private java.lang.String summaryOriginId;
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockSummaryHistoryVO.java

@@ -62,5 +62,9 @@ public class InterlockSummaryHistoryVO {
     @Excel(name = "回路健康级别", width = 15, mergeVertical = true, mergeRely = {0})
     @ApiModelProperty(value = "回路健康级别")
     private java.lang.String loopHealthLevel;
+    /**该联锁在原联锁总表的id*/
+    @Excel(name = "该联锁在原联锁总表的id", width = 15)
+    @ApiModelProperty(value = "该联锁在原联锁总表的id")
+    private java.lang.String summaryOriginId;
 
 }