detail加上系统id，去掉当前值相关字段

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/convert/InterlockDetailConvert.java

@@ -20,7 +20,8 @@ public interface InterlockDetailConvert {
     @Mapping(target = "id", ignore = true)
     @Mapping(target = "interlockname",source = "interlockName")
     @Mapping(target = "tagTime",source = "tagTime")
-    InterlockDetail toEntity(InterlockDetailAddDTO dto,String interlockName,String tagTime);
+    @Mapping(target = "interlockSystemId",source = "interlockSystemId")
+    InterlockDetail toEntity(InterlockDetailAddDTO dto,String interlockName,String tagTime, String interlockSystemId);
 
     InterlockDetailAddDTO toDTO(InterlockDetail detail);
 

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

@@ -118,22 +118,6 @@ public class InterlockDetailAddDTO {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
-    /**当前值-设备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;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")

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

@@ -22,4 +22,10 @@ public class InterlockDetailQueryDTO {
     @Excel(name = "联锁条件点位", width = 15)
     @ApiModelProperty(value = "联锁条件点位")
     private java.lang.String interlockConditionTag;
+
+
+    /**系统id*/
+    @Excel(name = "系统id", width = 15)
+    @ApiModelProperty(value = "系统id")
+    private java.lang.String interlockSystemId;
 }

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

@@ -135,22 +135,6 @@ public class InterlockDetail implements Serializable {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
-    /**当前值-设备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;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")
@@ -251,4 +235,8 @@ public class InterlockDetail 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 interlockSystemId;
 }

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

@@ -5,7 +5,7 @@
     <!-- 联锁详细信息表分页列表查询-->
     <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.detail.vo.InterlockDetailQueryVO">
         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.instrument_status, d.interlock_set_value, d.if_bypass, d.input_status, d.output_status,
         d.mp_status, s.ljgx, s.interlock_out_value
         from interlock_detail d left join interlock_summary s on d.summaryid = s.id
         <where>

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailEditQueryVO.java

@@ -125,22 +125,6 @@ public class InterlockDetailEditQueryVO {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
-    /**当前值-设备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;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")

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

@@ -46,10 +46,6 @@ public class InterlockDetailQueryVO {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")
@@ -57,24 +53,28 @@ public class InterlockDetailQueryVO {
     private java.lang.String ifBypass;
     /**旁路状态（0否1是）*/
     @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
-    @Dict(dicCode = "bypass")
+//    @Dict(dicCode = "bypass")
     @ApiModelProperty(value = "旁路状态（0否1是）")
     private java.lang.String bypass;
+    private java.lang.String bypass_dictText;
     /**输入卡件状态*/
     @Excel(name = "输入卡件状态", width = 15)
-    @Dict(dicCode = "input_status")
+//    @Dict(dicCode = "input_status")
     @ApiModelProperty(value = "输入卡件状态")
     private java.lang.String inputStatus;
+    private java.lang.String inputStatus_dictText;
     /**输出卡件状态*/
     @Excel(name = "输出卡件状态", width = 15)
-    @Dict(dicCode = "output_status")
+//    @Dict(dicCode = "output_status")
     @ApiModelProperty(value = "输出卡件状态")
     private java.lang.String outputStatus;
+    private java.lang.String outputStatus_dictText;
     /**MP状态*/
     @Excel(name = "MP状态", width = 15)
-    @Dict(dicCode = "mp_status")
+//    @Dict(dicCode = "mp_status")
     @ApiModelProperty(value = "MP状态")
     private java.lang.String mpStatus;
+    private java.lang.String mpStatus_dictText;
 
     /**逻辑关系*/
     @Excel(name = "逻辑关系", width = 15)

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

@@ -135,22 +135,6 @@ public class InterlockDetailHistory implements Serializable {
 	@Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-	/**当前值*/
-	@Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
-	/**当前值-设备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;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")
@@ -248,4 +232,8 @@ public class InterlockDetailHistory 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 interlockSystemId;
 }

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

@@ -44,10 +44,6 @@ public class InterlockDetailHistoryQueryVO {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")

jeecg-module-interlock/src/main/java/org/jeecg/modules/temp/entity/InterlockDetailTemp.java

@@ -135,22 +135,6 @@ public class InterlockDetailTemp implements Serializable {
     @Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
     private java.lang.String interlockSetValue;
-    /**当前值*/
-    @Excel(name = "当前值", width = 15)
-    @ApiModelProperty(value = "当前值")
-    private java.lang.String currentValue;
-    /**当前值-设备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;
     /**是否旁路（0否1是）*/
     @Excel(name = "是否旁路（0否1是）", width = 15, dicCode = "if_bypass")
     @Dict(dicCode = "if_bypass")