fix新增编辑detail表的联锁名称；联锁总表的联锁输出值-设备id、模块名称

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

@@ -18,7 +18,8 @@ public interface InterlockDetailConvert {
     InterlockDetailConvert INSTANCE = Mappers.getMapper(InterlockDetailConvert.class);
 
     @Mapping(target = "id", ignore = true)
-    InterlockDetail toEntity(InterlockDetailAddDTO dto);
+    @Mapping(target = "interlockname",source = "interlockName")
+    InterlockDetail toEntity(InterlockDetailAddDTO dto,String interlockName);
 
     InterlockDetailAddDTO toDTO(InterlockDetail detail);
 

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

@@ -34,6 +34,8 @@ public interface InterlockSummaryConvert {
     @Mapping(target = "ljgx",source = "interlockAddDTO.ljgx")
     @Mapping(target = "interlockStatus",source = "interlockStatus")
     @Mapping(target = "loopHealthLevel",source = "loopHealthLevel")
+    @Mapping(target = "deviceId",source = "deviceId")
+    @Mapping(target = "moduleName",source = "moduleName")
     InterlockSummary toInterlockSummary(InterlockAddDTO interlockAddDTO,String interlockStatus,String loopHealthLevel);
 
 

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

@@ -65,6 +65,14 @@ public class InterlockSummary implements Serializable {
 	@Excel(name = "联锁输出值", width = 15)
     @ApiModelProperty(value = "联锁输出值")
     private java.lang.String interlockOutValue;
+    /**联锁输出值-设备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 = "联锁输出值点位")

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

@@ -171,7 +171,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
                 controlSystemStatus = "1";
             } else dto.setControlSystemStatus("0");
 
-            InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto);
+            InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto, interlockAddDTO.getInterlockName());
 
             //新增联锁详细信息表数据
             interlockDetailMapper.insert(detail);
@@ -250,8 +250,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
                 controlSystemStatus = "1";
             } else dto.setControlSystemStatus("0");
 
-            InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto);
-
+            InterlockDetail detail = InterlockDetailConvert.INSTANCE.toEntity(dto,interlockAddDTO.getInterlockName());
             //新增联锁详细信息表数据
             interlockDetailMapper.insert(detail);