Explorar el Código

联锁详细表和历史详细表查询添加各状态的位号参数

sl hace 3 semanas
padre
commit
6cc11b125b

+ 3 - 1
jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -12,7 +12,9 @@
         h3.control_system_status_name as output_status_name,
         h4.bypass_name,
         h5.instrument_status_name,
-        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal, d.interlock_current_unit, d.interlock_set_unit
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
+        d.interlock_current_unit, d.interlock_set_unit,
+        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag
         from interlock_detail d
         left join interlock_summary s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id

+ 12 - 0
jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailQueryVO.java

@@ -105,4 +105,16 @@ public class InterlockDetailQueryVO {
     private java.lang.String interlockCurrentUnit;
     /**联锁设定值单位*/
     private java.lang.String interlockSetUnit;
+
+    /**旁路状态位号*/
+    private java.lang.String bypassTag;
+    /**输入状态位号*/
+    private java.lang.String inputStatusTag;
+    /**输出状态位号*/
+    private java.lang.String outputStatusTag;
+    /**MP状态位号*/
+    private java.lang.String mpStatusTag;
+    /**联锁输出值位号*/
+    private java.lang.String interlockOutValueTag;
+
 }

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

@@ -12,7 +12,9 @@
                h3.control_system_status_name as output_status_name,
                h4.bypass_name,
                h5.instrument_status_name,
-        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal, d.interlock_current_unit, d.interlock_set_unit
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal,
+        d.interlock_current_unit, d.interlock_set_unit,
+        d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag
         from interlock_detail_history d
         left join interlock_summary_history s on d.summaryid = s.id
         left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id

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

@@ -109,5 +109,15 @@ public class InterlockDetailHistoryQueryVO {
     private java.lang.String interlockCurrentUnit;
     /**联锁设定值单位*/
     private java.lang.String interlockSetUnit;
+    /**旁路状态位号*/
+    private java.lang.String bypassTag;
+    /**输入状态位号*/
+    private java.lang.String inputStatusTag;
+    /**输出状态位号*/
+    private java.lang.String outputStatusTag;
+    /**MP状态位号*/
+    private java.lang.String mpStatusTag;
+    /**联锁输出值位号*/
+    private java.lang.String interlockOutValueTag;
 
 }