修改联锁总表、联锁详细信息字段

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/controller/InterlockDetailController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Api(tags="联锁详细信息表")

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Data
@@ -44,31 +44,51 @@ public class InterlockDetail implements Serializable {
 	@Excel(name = "联锁名称", width = 15)
     @ApiModelProperty(value = "联锁名称")
     private java.lang.String interlockname;
-	/**联锁条件*/
-	@Excel(name = "联锁条件", width = 15)
-    @ApiModelProperty(value = "联锁条件")
-    private java.lang.String interlockcondition;
+	/**联锁条件值*/
+	@Excel(name = "联锁条件值", width = 15)
+    @ApiModelProperty(value = "联锁条件值")
+    private java.lang.String interlockCondition;
+	/**联锁条件点位*/
+	@Excel(name = "联锁条件点位", width = 15)
+    @ApiModelProperty(value = "联锁条件点位")
+    private java.lang.String interlockConditionTag;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String description;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deviceId;
+	/**模块名称*/
+	@Excel(name = "模块名称", width = 15)
+    @ApiModelProperty(value = "模块名称")
+    private java.lang.String moduleName;
+	/**仪表状态*/
+	@Excel(name = "仪表状态", width = 15)
+    @ApiModelProperty(value = "仪表状态")
+    private java.lang.String instrumentStatus;
 	/**仪表状态判断方式*/
 	@Excel(name = "仪表状态判断方式", width = 15, dicCode = "instrument_status_juge")
 	@Dict(dicCode = "instrument_status_juge")
     @ApiModelProperty(value = "仪表状态判断方式")
     private java.lang.String instrumentStatusJuge;
-	/**仪表状态位号*/
-	@Excel(name = "仪表状态位号", width = 15)
-    @ApiModelProperty(value = "仪表状态位号")
+	/**仪表状态点位*/
+	@Excel(name = "仪表状态点位", width = 15)
+    @ApiModelProperty(value = "仪表状态点位")
     private java.lang.String instrumentStatusTag;
-	/**仪表状态位号值*/
-	@Excel(name = "仪表状态位号值", width = 15)
-    @ApiModelProperty(value = "仪表状态位号值")
-    private java.lang.String instrumentStatusTagValue;
+	/**仪表状态值*/
+	@Excel(name = "仪表状态值", width = 15)
+    @ApiModelProperty(value = "仪表状态值")
+    private java.lang.String instrumentStatusValue;
 	/**原始模拟量位号*/
 	@Excel(name = "原始模拟量位号", width = 15)
     @ApiModelProperty(value = "原始模拟量位号")
     private java.lang.String ysmnlTag;
-	/**原始模拟量位号值*/
-	@Excel(name = "原始模拟量位号值", width = 15)
-    @ApiModelProperty(value = "原始模拟量位号值")
-    private java.lang.String ysmnlTagValue;
+	/**原始模拟量值*/
+	@Excel(name = "原始模拟量值", width = 15)
+    @ApiModelProperty(value = "原始模拟量值")
+    private java.lang.String ysmnlValue;
 	/**高限*/
 	@Excel(name = "高限", width = 15)
     @ApiModelProperty(value = "高限")
@@ -89,66 +109,54 @@ public class InterlockDetail implements Serializable {
 	@Excel(name = "时间单位", width = 15)
     @ApiModelProperty(value = "时间单位")
     private java.lang.String thresholdTimeUnit;
-	/**描述*/
-	@Excel(name = "描述", width = 15)
-    @ApiModelProperty(value = "描述")
-    private java.lang.String description;
-	/**逻辑关系*/
-	@Excel(name = "逻辑关系", width = 15)
-    @ApiModelProperty(value = "逻辑关系")
-    private java.lang.String ljgx;
 	/**联锁设定值*/
 	@Excel(name = "联锁设定值", width = 15)
     @ApiModelProperty(value = "联锁设定值")
-    private java.lang.String interlocksetvalue;
+    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;
+    private java.lang.String currentValue;
 	/**当前值位号*/
 	@Excel(name = "当前值位号", width = 15)
     @ApiModelProperty(value = "当前值位号")
-    private java.lang.String currentvalueTagNum;
+    private java.lang.String currentValueTag;
 	/**是否旁路*/
 	@Excel(name = "是否旁路", width = 15)
     @ApiModelProperty(value = "是否旁路")
-    private java.lang.String ifbypass;
-	/**位号*/
-	@Excel(name = "位号", width = 15)
-    @ApiModelProperty(value = "位号")
-    private java.lang.String ifbypassTagNum;
-	/**联锁输出值*/
-	@Excel(name = "联锁输出值", width = 15)
-    @ApiModelProperty(value = "联锁输出值")
-    private java.lang.String interlockoutvalue;
-	/**联锁输出值位号*/
-	@Excel(name = "联锁输出值位号", width = 15)
-    @ApiModelProperty(value = "联锁输出值位号")
-    private java.lang.String interlockoutvalueTagNum;
+    private java.lang.String ifBypass;
+	/**旁路状态点位*/
+	@Excel(name = "旁路状态点位", width = 15)
+    @ApiModelProperty(value = "旁路状态点位")
+    private java.lang.String ifBypassTag;
 	/**输入卡件状态*/
 	@Excel(name = "输入卡件状态", width = 15)
     @ApiModelProperty(value = "输入卡件状态")
-    private java.lang.String inputstatus;
-	/**输入卡件状态位号*/
-	@Excel(name = "输入卡件状态位号", width = 15)
-    @ApiModelProperty(value = "输入卡件状态位号")
-    private java.lang.String inputstatusTagNum;
+    private java.lang.String inputStatus;
+	/**输入卡件状态点位*/
+	@Excel(name = "输入卡件状态点位", width = 15)
+    @ApiModelProperty(value = "输入卡件状态点位")
+    private java.lang.String inputStatusTag;
 	/**输出卡件状态*/
 	@Excel(name = "输出卡件状态", width = 15)
     @ApiModelProperty(value = "输出卡件状态")
-    private java.lang.String outputstatus;
-	/**输出卡件状态位号*/
-	@Excel(name = "输出卡件状态位号", width = 15)
-    @ApiModelProperty(value = "输出卡件状态位号")
-    private java.lang.String outputstatusTagNum;
+    private java.lang.String outputStatus;
+	/**输出卡件状态点位*/
+	@Excel(name = "输出卡件状态点位", width = 15)
+    @ApiModelProperty(value = "输出卡件状态点位")
+    private java.lang.String outputStatusTag;
 	/**MP状态*/
 	@Excel(name = "MP状态", width = 15)
     @ApiModelProperty(value = "MP状态")
-    private java.lang.String mpstatus;
-	/**状态位号*/
-	@Excel(name = "状态位号", width = 15)
-    @ApiModelProperty(value = "状态位号")
-    private java.lang.String mpstatusTagNum;
+    private java.lang.String mpStatus;
+	/**状态点位*/
+	@Excel(name = "状态点位", width = 15)
+    @ApiModelProperty(value = "状态点位")
+    private java.lang.String mpStatusTag;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 public interface InterlockDetailMapper extends BaseMapper<InterlockDetail> {

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/IInterlockDetailService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 public interface IInterlockDetailService extends IService<InterlockDetail> {

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/service/impl/InterlockDetailServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 联锁详细信息表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Service

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/controller/InterlockSummaryController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Api(tags="联锁总表")

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/entity/InterlockSummary.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Data
@@ -40,26 +40,34 @@ public class InterlockSummary implements Serializable {
 	@Excel(name = "联锁名称", width = 15)
     @ApiModelProperty(value = "联锁名称")
     private java.lang.String interlockName;
-	/**联锁条件*/
-	@Excel(name = "联锁条件", width = 15)
-    @ApiModelProperty(value = "联锁条件")
-    private java.lang.String interlockCondition;
-	/**仪表状态*/
-	@Excel(name = "仪表状态", width = 15)
-    @ApiModelProperty(value = "仪表状态")
-    private java.lang.String instrumentStatus;
+	/**系统id*/
+	@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 interlockApparatusId;
 	/**联锁状态*/
 	@Excel(name = "联锁状态", width = 15)
     @ApiModelProperty(value = "联锁状态")
     private java.lang.String interlockStatus;
-	/**控制系统状态*/
-	@Excel(name = "控制系统状态", width = 15)
-    @ApiModelProperty(value = "控制系统状态")
-    private java.lang.String controlSystemStatus;
 	/**回路健康级别*/
 	@Excel(name = "回路健康级别", width = 15)
     @ApiModelProperty(value = "回路健康级别")
     private java.lang.String loopHealthLevel;
+	/**逻辑关系*/
+	@Excel(name = "逻辑关系", width = 15)
+    @ApiModelProperty(value = "逻辑关系")
+    private java.lang.String ljgx;
+	/**联锁输出值*/
+	@Excel(name = "联锁输出值", width = 15)
+    @ApiModelProperty(value = "联锁输出值")
+    private java.lang.String interlockOutValue;
+	/**联锁输出值点位*/
+	@Excel(name = "联锁输出值点位", width = 15)
+    @ApiModelProperty(value = "联锁输出值点位")
+    private java.lang.String interlockOutValueTag;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/mapper/InterlockSummaryMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 public interface InterlockSummaryMapper extends BaseMapper<InterlockSummary> {

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/IInterlockSummaryService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 public interface IInterlockSummaryService extends IService<InterlockSummary> {

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
- * @Date:   2024-05-22
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Service