联锁批量删除、联锁编辑查看的数据字典转化

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

@@ -2,13 +2,9 @@ package org.jeecg.modules.detail.convert;
 
 import org.jeecg.modules.detail.dto.InterlockDetailAddDTO;
 import org.jeecg.modules.detail.entity.InterlockDetail;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.ReportingPolicy;
+import org.jeecg.modules.detail.vo.InterlockDetailEditQueryVO;
+import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import org.springframework.util.CollectionUtils;
-
-import java.util.stream.Collectors;
 
 /**
  * 功能描述
@@ -26,4 +22,58 @@ public interface InterlockDetailConvert {
 
     InterlockDetailAddDTO toDTO(InterlockDetail detail);
 
+    @Mapping(target = "instrumentStatus_dictText", source = "instrumentStatus", qualifiedByName = "mapInstrumentStatus")
+    @Mapping(target = "instrumentStatusJuge_dictText", source = "instrumentStatusJuge", qualifiedByName = "mapInstrumentStatusJuge")
+    @Mapping(target = "controlSystemStatus_dictText", source = "controlSystemStatus", qualifiedByName = "mapControlSystemStatus")
+    @Mapping(target = "ifBypass_dictText", source = "ifBypass", qualifiedByName = "mapIfBypass")
+    @Mapping(target = "bypass_dictText", source = "bypass", qualifiedByName = "mapBypass")
+    InterlockDetailEditQueryVO toEditVO(InterlockDetail detail);
+
+    //仪表状态
+    @Named("mapInstrumentStatus")
+    default String mapInstrumentStatus(String instrumentStatus) {
+        if ("0".equals(instrumentStatus)) {
+            return "正常";
+        } else if("1".equals(instrumentStatus)){
+            return "故障";
+        }else return null;
+    }
+    //仪表状态判断方式
+    @Named("mapInstrumentStatusJuge")
+    default String mapInstrumentStatusJuge(String instrumentStatusJuge) {
+        if ("0".equals(instrumentStatusJuge)) {
+            return "否";
+        } else if("1".equals(instrumentStatusJuge)){
+            return "是";
+        } else if("2".equals(instrumentStatusJuge)){
+            return "突变超限判断";
+        }else return null;
+    }
+    //控制系统状态
+    @Named("mapControlSystemStatus")
+    default String mapControlSystemStatus(String controlSystemStatus) {
+        if ("0".equals(controlSystemStatus)) {
+            return "正常";
+        } else if("1".equals(controlSystemStatus)){
+            return "非正常";
+        } else return null;
+    }
+    //是否旁路
+    @Named("mapIfBypass")
+    default String mapIfBypass(String ifBypass) {
+        if ("0".equals(ifBypass)) {
+            return "否";
+        } else if("1".equals(ifBypass)){
+            return "是";
+        } else return null;
+    }
+    //旁路状态
+    @Named("mapBypass")
+    default String mapBypass(String bypass) {
+        if ("0".equals(bypass)) {
+            return "否";
+        } else if("1".equals(bypass)){
+            return "是";
+        } else return null;
+    }
 }

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

@@ -0,0 +1,216 @@
+package org.jeecg.modules.detail.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 功能描述
+ *
+ * @author: nn
+ * @date: 2024年06月03日 10:14
+ */
+@Data
+public class InterlockDetailEditQueryVO {
+    private static final long serialVersionUID = 1L;
+
+    /**id*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+    /**联锁总表id*/
+    @Excel(name = "联锁总表id", width = 15)
+    @ApiModelProperty(value = "联锁总表id")
+    private java.lang.String summaryid;
+    /**联锁名称*/
+    @Excel(name = "联锁名称", width = 15)
+    @ApiModelProperty(value = "联锁名称")
+    private java.lang.String interlockname;
+    /**联锁条件值*/
+    @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 = "联锁条件点位")
+    private java.lang.String interlockConditionTag;
+    /**描述。*/
+    @Excel(name = "描述。", width = 15)
+    @ApiModelProperty(value = "描述。")
+    private java.lang.String description;
+    /**仪表状态（0正常1故障）*/
+    @Excel(name = "仪表状态（0正常1故障）", width = 15, dicCode = "instrument_status")
+    @Dict(dicCode = "instrument_status")
+    @ApiModelProperty(value = "仪表状态（0正常1故障）")
+    private java.lang.String instrumentStatus;
+    private java.lang.String instrumentStatus_dictText;
+    /**仪表状态判断方式（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;
+    private java.lang.String instrumentStatusJuge_dictText;
+    /**仪表状态-设备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 = "仪表状态点位")
+    private java.lang.String instrumentStatusTag;
+    /**仪表状态值*/
+    @Excel(name = "仪表状态值", width = 15)
+    @ApiModelProperty(value = "仪表状态值")
+    private java.lang.String instrumentStatusValue;
+    /**原始模拟-设备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)
+    @ApiModelProperty(value = "原始模拟量值")
+    private java.lang.String ysmnlValue;
+    /**高限*/
+    @Excel(name = "高限", width = 15)
+    @ApiModelProperty(value = "高限")
+    private java.lang.String upperLimit;
+    /**低限*/
+    @Excel(name = "低限", width = 15)
+    @ApiModelProperty(value = "低限")
+    private java.lang.String lowerLimit;
+    /**阈值*/
+    @Excel(name = "阈值", width = 15)
+    @ApiModelProperty(value = "阈值")
+    private java.lang.String thresholdValue;
+    /**时间*/
+    @Excel(name = "时间", width = 15)
+    @ApiModelProperty(value = "时间")
+    private java.lang.String thresholdTime;
+    /**时间单位*/
+    @Excel(name = "时间单位", width = 15)
+    @ApiModelProperty(value = "时间单位")
+    private java.lang.String thresholdTimeUnit;
+    /**控制系统状态（	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;
+    private java.lang.String controlSystemStatus_dictText;
+    /**联锁设定值*/
+    @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")
+    @ApiModelProperty(value = "是否旁路（0否1是）")
+    private java.lang.String ifBypass;
+    private java.lang.String ifBypass_dictText;
+    /**旁路状态（0否1是）*/
+    @Excel(name = "旁路状态（0否1是）", width = 15, dicCode = "bypass")
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态（0否1是）")
+    private java.lang.String bypass;
+    private java.lang.String bypass_dictText;
+    /**旁路状态-设备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 = "旁路状态点位")
+    private java.lang.String bypassTag;
+    /**输入卡件状态*/
+    @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 = "输入卡件状态点位")
+    private java.lang.String inputStatusTag;
+    /**输出卡件状态*/
+    @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 = "输出卡件状态点位")
+    private java.lang.String outputStatusTag;
+    /**MP状态*/
+    @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 = "状态点位")
+    private java.lang.String mpStatusTag;
+}

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

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.summary.dto.InterlockAddDTO;
+import org.jeecg.modules.summary.dto.InterlockEditQueryVO;
 import org.jeecg.modules.summary.entity.InterlockSummary;
 import org.jeecg.modules.summary.service.IInterlockSummaryService;
 
@@ -51,31 +52,22 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 	@Autowired
 	private IInterlockSummaryService interlockSummaryService;
 
-	 @ApiOperation(value="测试", notes="测试")
-	 @GetMapping(value = "/list111")
-	 public Result<List<InterlockSummary>> list(InterlockSummary interlockSummary,
-														  HttpServletRequest req) {
-		 QueryWrapper<InterlockSummary> queryWrapper = QueryGenerator.initQueryWrapper(interlockSummary, req.getParameterMap());
-		 List<InterlockSummary> list = interlockSummaryService.list(queryWrapper);
-		 return Result.OK(list);
-	 }
-
 	/**
-	 *  联锁及详细信息——用于编辑
+	 *  按联锁总表id查询联锁及详细信息——用于编辑
 	 */
-	@AutoLog(value = "联锁及详细信息——用于编辑")
-	@ApiOperation(value="联锁及详细信息——用于编辑", notes="联锁及详细信息——用于编辑")
+	@AutoLog(value = "按联锁总表id查询联锁及详细信息——用于编辑")
+	@ApiOperation(value=".按联锁总表id查询联锁及详细信息——用于编辑", notes="按联锁总表id查询联锁及详细信息——用于编辑")
 	@GetMapping(value = "/xxxxLS")
-	public Result<InterlockAddDTO> xxxxLS(@RequestParam(name="id",required=true) String id) {
-		InterlockAddDTO interlockAddDTO = interlockSummaryService.xxxxLS(id);
-		return Result.OK(interlockAddDTO);
+	public Result<InterlockEditQueryVO> xxxxLS(@RequestParam(name="id",required=true) String id) {
+		InterlockEditQueryVO interlockEditQueryVO = interlockSummaryService.xxxxLS(id);
+		return Result.OK(interlockEditQueryVO);
 	}
 
 	 /**
 	  *   联锁管理——修改联锁
 	  */
 	 @AutoLog(value = "联锁管理——修改联锁")
-	 @ApiOperation(value="联锁管理——修改联锁", notes="联锁管理——修改联锁")
+	 @ApiOperation(value=".联锁管理——修改联锁", notes="联锁管理——修改联锁")
 	 //@RequiresPermissions("org.jeecg.modules:interlock_summary:editLS")
 	 @RequestMapping(value = "/editLS", method = {RequestMethod.PUT,RequestMethod.POST})
 	 public Result<String> editLS(@RequestBody InterlockAddDTO interlockAddDTO) {
@@ -87,7 +79,7 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 	  *   联锁管理——新增联锁
 	  */
 	 @AutoLog(value = "联锁管理——新增联锁")
-	 @ApiOperation(value="联锁管理——新增联锁", notes="联锁管理——新增联锁")
+	 @ApiOperation(value=".联锁管理——新增联锁", notes="联锁管理——新增联锁")
 	 //@RequiresPermissions("org.jeecg.modules:interlock_summary:addLS")
 	 @PostMapping(value = "/addLS")
 	 public Result<String> addLS(@RequestBody InterlockAddDTO interlockAddDTO) {
@@ -95,7 +87,38 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 		 return Result.OK("添加成功！");
 	 }
 
-	/**
+	 /**
+	  *   通过id删除联锁总表、联锁详细信息、点位
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "通过id删除联锁总表、联锁详细信息、点位")
+	 @ApiOperation(value=".通过id删除联锁总表、联锁详细信息、点位", notes="通过id删除联锁总表、联锁详细信息、点位")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_summary:delete")
+	 @DeleteMapping(value = "/delete")
+	 public Result<String> delete1(@RequestParam(name="id",required=true) String id) {
+		 interlockSummaryService.delete(id);
+		 return Result.OK("删除成功!");
+	 }
+
+	 /**
+	  *  根据联锁总表id批量删除联锁及详细信息、点位
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "根据联锁总表id批量删除联锁及详细信息、点位")
+	 @ApiOperation(value=".根据联锁总表id批量删除联锁及详细信息、点位", notes="根据联锁总表id批量删除联锁及详细信息、点位")
+	 //@RequiresPermissions("org.jeecg.modules:interlock_summary:deleteBatch")
+	 @DeleteMapping(value = "/deleteBatch")
+	 public Result<String> deleteBatch1(@RequestParam(name="ids",required=true) String ids) {
+		 this.interlockSummaryService.deleteByIds(Arrays.asList(ids.split(",")));
+		 return Result.OK("批量删除成功!");
+	 }
+
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param interlockSummary
@@ -147,20 +170,6 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 		return Result.OK("编辑成功!");
 	}
 
-	 /**
-	  *   通过id删除联锁总表、联锁详细信息、点位
-	  *
-	  * @param id
-	  * @return
-	  */
-	 @AutoLog(value = "通过id删除联锁总表、联锁详细信息、点位")
-	 @ApiOperation(value="通过id删除联锁总表、联锁详细信息、点位", notes="通过id删除联锁总表、联锁详细信息、点位")
-	 //@RequiresPermissions("org.jeecg.modules:interlock_summary:delete")
-	 @DeleteMapping(value = "/delete")
-	 public Result<String> delete1(@RequestParam(name="id",required=true) String id) {
-		 interlockSummaryService.delete(id);
-		 return Result.OK("删除成功!");
-	 }
 
 	/**
 	 *   通过id删除
@@ -186,7 +195,7 @@ public class InterlockSummaryController extends JeecgController<InterlockSummary
 	@AutoLog(value = "联锁总表-批量删除")
 	@ApiOperation(value="联锁总表-批量删除", notes="联锁总表-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:interlock_summary:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
+//	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.interlockSummaryService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/convert/InterlockSummaryConvert.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.summary.convert;
 
 import org.jeecg.modules.detail.dto.InterlockDetailAddDTO;
+import org.jeecg.modules.detail.vo.InterlockDetailEditQueryVO;
 import org.jeecg.modules.summary.dto.InterlockAddDTO;
+import org.jeecg.modules.summary.dto.InterlockEditQueryVO;
 import org.jeecg.modules.summary.entity.InterlockSummary;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -37,4 +39,6 @@ public interface InterlockSummaryConvert {
 
     InterlockAddDTO toDTO(InterlockSummary summary, List<InterlockDetailAddDTO> interlockDetailAddDTOList);
 
+    InterlockEditQueryVO toVO(InterlockSummary summary, List<InterlockDetailEditQueryVO> interlockDetailEditQueryVOList);
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/dto/InterlockEditQueryVO.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.summary.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.detail.vo.InterlockDetailEditQueryVO;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.List;
+
+/**
+ * 功能描述
+ *
+ * @author: nn
+ * @date: 2024年06月03日 11:01
+ */
+@Data
+public class InterlockEditQueryVO {
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**联锁名称*/
+    @Excel(name = "联锁名称", width = 15)
+    @ApiModelProperty(value = "联锁名称")
+    private java.lang.String interlockName;
+    /**系统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;
+    /**联锁输出值-设备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 = "联锁状态")
+    @Dict(dicCode = "interlock_status")
+    private java.lang.String interlockStatus;
+    /**回路健康级别*/
+    @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;
+
+    List<InterlockDetailEditQueryVO> interlockDetailEditQueryVOList;
+
+}

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

@@ -2,8 +2,11 @@ package org.jeecg.modules.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.summary.dto.InterlockAddDTO;
+import org.jeecg.modules.summary.dto.InterlockEditQueryVO;
 import org.jeecg.modules.summary.entity.InterlockSummary;
 
+import java.util.List;
+
 /**
  * @Description: 联锁总表
  * @Author: jeecg-boot
@@ -13,6 +16,11 @@ import org.jeecg.modules.summary.entity.InterlockSummary;
 public interface IInterlockSummaryService extends IService<InterlockSummary> {
 
     /**
+     *  根据联锁总表id批量删除联锁及详细信息、点位
+     */
+    public void deleteByIds(List<String> idList);
+
+    /**
      *  删除联锁及详细信息、点位
      */
     public void delete(String id);
@@ -20,7 +28,7 @@ public interface IInterlockSummaryService extends IService<InterlockSummary> {
     /**
      *  联锁及详细信息——用于编辑
      */
-    public InterlockAddDTO xxxxLS(String id);
+    public InterlockEditQueryVO xxxxLS(String id);
 
     /**
      *   联锁管理——编辑联锁

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

@@ -8,9 +8,11 @@ import org.jeecg.modules.detail.convert.InterlockDetailConvert;
 import org.jeecg.modules.detail.dto.InterlockDetailAddDTO;
 import org.jeecg.modules.detail.entity.InterlockDetail;
 import org.jeecg.modules.detail.mapper.InterlockDetailMapper;
+import org.jeecg.modules.detail.vo.InterlockDetailEditQueryVO;
 import org.jeecg.modules.summary.constants.InterlockConstants;
 import org.jeecg.modules.summary.convert.InterlockSummaryConvert;
 import org.jeecg.modules.summary.dto.InterlockAddDTO;
+import org.jeecg.modules.summary.dto.InterlockEditQueryVO;
 import org.jeecg.modules.summary.entity.InterlockSummary;
 import org.jeecg.modules.summary.mapper.InterlockSummaryMapper;
 import org.jeecg.modules.summary.service.IInterlockSummaryService;
@@ -49,6 +51,26 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
     @SuppressWarnings("all")
     private IInterlockTagService interlockTagService;
 
+    /**
+     *  根据联锁总表id批量删除联锁及详细信息、点位
+     */
+    public void deleteByIds(List<String> idList){
+        if(idList != null && !idList.isEmpty()){
+            for (String id : idList){
+                //删除点位
+                LambdaQueryWrapper<InterlockTag> tagWrapper = new LambdaQueryWrapper<>();
+                tagWrapper.eq(InterlockTag::getInterlockSummaryId,id);
+                interlockTagService.remove(tagWrapper);
+                //删除联锁详细信息
+                LambdaQueryWrapper<InterlockDetail> detailWrapper = new LambdaQueryWrapper<>();
+                detailWrapper.eq(InterlockDetail::getSummaryid,id);
+                interlockDetailMapper.delete(detailWrapper);
+                //删除联锁
+                interlockSummaryMapper.deleteById(id);
+            }
+        }
+    }
+
 
     /**
      *  删除联锁及详细信息、点位
@@ -69,7 +91,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
     /**
      *  联锁及详细信息——用于编辑
      */
-    public InterlockAddDTO xxxxLS(String id){
+    public InterlockEditQueryVO xxxxLS(String id){
 
 
         InterlockSummary summary = interlockSummaryMapper.selectById(id);
@@ -77,12 +99,13 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         LambdaQueryWrapper<InterlockDetail> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(InterlockDetail::getSummaryid,id);
         List<InterlockDetail> detailList = interlockDetailMapper.selectList(queryWrapper);
-        List<InterlockDetailAddDTO> interlockDetailAddDTOList = detailList.stream().map(i-> {
-            return InterlockDetailConvert.INSTANCE.toDTO(i);
+
+        List<InterlockDetailEditQueryVO> interlockDetailEditQueryVOList = detailList.stream().map(i-> {
+            return InterlockDetailConvert.INSTANCE.toEditVO(i);
         }).collect(Collectors.toList());
 
-        InterlockAddDTO dto = InterlockSummaryConvert.INSTANCE.toDTO(summary,interlockDetailAddDTOList);
-        return dto;
+        InterlockEditQueryVO vo = InterlockSummaryConvert.INSTANCE.toVO(summary, interlockDetailEditQueryVOList);
+        return vo;
     }
 
     /**