fix联锁管理新增

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

@@ -25,6 +25,9 @@ public interface InterlockSummaryConvert {
 
     InterlockSummaryConvert INSTANCE = Mappers.getMapper(InterlockSummaryConvert.class);
 
+    /**
+     * 转化成summary——用于新增联锁里的新增
+     */
     @Mapping(target = "id",source = "interlockAddDTO.id")
     @Mapping(target = "interlockName",source = "interlockAddDTO.interlockName")
     @Mapping(target = "interlockSystemId",source = "interlockAddDTO.interlockSystemId")
@@ -38,6 +41,28 @@ public interface InterlockSummaryConvert {
     @Mapping(target = "moduleName",source = "interlockAddDTO.moduleName")
     InterlockSummary toInterlockSummary(InterlockAddDTO interlockAddDTO,String interlockStatus,String loopHealthLevel);
 
+    /**
+     * 转化成summary——用于联锁编辑里的编辑
+     */
+    @Mapping(target = "interlockName",source = "interlockAddDTO.interlockName")
+    @Mapping(target = "interlockSystemId",source = "interlockAddDTO.interlockSystemId")
+    @Mapping(target = "interlockApparatusId",source = "interlockAddDTO.interlockApparatusId")
+    @Mapping(target = "interlockOutValueTag",source = "interlockAddDTO.interlockOutValueTag")
+    @Mapping(target = "interlockOutValue",source = "interlockAddDTO.interlockOutValue")
+    @Mapping(target = "ljgx",source = "interlockAddDTO.ljgx")
+    @Mapping(target = "interlockStatus",source = "interlockStatus")
+    @Mapping(target = "loopHealthLevel",source = "loopHealthLevel")
+    @Mapping(target = "deviceId",source = "interlockAddDTO.deviceId")
+    @Mapping(target = "moduleName",source = "interlockAddDTO.moduleName")
+    InterlockSummary toInterlockSummary1(InterlockAddDTO interlockAddDTO,String interlockStatus,String loopHealthLevel);
+
+    /**
+     * 转化成summary——用于新增联锁里的编辑
+     */
+    @Mapping(target = "interlockStatus",source = "interlockStatus")
+    @Mapping(target = "loopHealthLevel",source = "loopHealthLevel")
+    InterlockSummary toInterlockSummary2(InterlockSummary interlockSummary,String interlockStatus,String loopHealthLevel);
+
 
     InterlockAddDTO toDTO(InterlockSummary summary, List<InterlockDetailAddDTO> interlockDetailAddDTOList);
 

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

@@ -123,8 +123,8 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         String instrumentStatus = "0";// 总体 仪表状态 0正常1故障
         int i = 0;
 
-        //查该系统下有无相同名称联锁，无则新增 //0装置1系统2联锁 //1是0否
-        interlockBaseService.judgeAndAdd(interlockAddDTO.getInterlockSystemId(), "2", interlockAddDTO.getInterlockName(), "0");
+//        //查该系统下有无相同名称联锁，无则新增 //0装置1系统2联锁 //1是0否
+//        interlockBaseService.judgeAndAdd(interlockAddDTO.getInterlockSystemId(), "2", interlockAddDTO.getInterlockName(), "0");
 
         //删除该联锁的所有联锁详细信息的所有点位
         LambdaQueryWrapper<InterlockTag> queryWrapper3 = new LambdaQueryWrapper<>();
@@ -188,7 +188,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         else if(i==2) loopHealthLevel="C";
         else if(i==3) loopHealthLevel="D";
 
-        InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary(interlockAddDTO,interlockStatus,loopHealthLevel);
+        InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary1(interlockAddDTO,interlockStatus,loopHealthLevel);
         //修改联锁总表数据
         interlockSummaryMapper.updateById(interlockSummary);
     }
@@ -207,8 +207,8 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         String instrumentStatus = "0";// 总体 仪表状态 0正常1故障
         int i = 0;
 
-        //查该系统下有无相同名称联锁，无则新增 //0装置1系统2联锁 //1是0否
-        interlockBaseService.judgeAndAdd(interlockAddDTO.getInterlockSystemId(), "2", interlockAddDTO.getInterlockName(), "0");
+//        //查该系统下有无相同名称联锁，无则新增 //0装置1系统2联锁 //1是0否
+//        interlockBaseService.judgeAndAdd(interlockAddDTO.getInterlockSystemId(), "2", interlockAddDTO.getInterlockName(), "0");
 
         //新增——联锁总表数据
         InterlockSummary interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary(interlockAddDTO,interlockStatus,loopHealthLevel);
@@ -266,7 +266,7 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
         else if(i==2) loopHealthLevel="C";
         else if(i==3) loopHealthLevel="D";
 
-        interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary(interlockAddDTO,interlockStatus,loopHealthLevel);
+        interlockSummary = InterlockSummaryConvert.INSTANCE.toInterlockSummary2(interlockSummary,interlockStatus,loopHealthLevel);
         //修改联锁总表数据
         interlockSummaryMapper.updateById(interlockSummary);
     }