1

src/main/java/com/fdkankan/fusion/controller/CaseFusionController.java

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.entity.FusionNum;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.FusionParam;
 import com.fdkankan.fusion.service.ICaseFusionService;
+import com.fdkankan.fusion.service.ICaseTagPointService;
 import com.fdkankan.fusion.service.IFusionMeterService;
 import com.fdkankan.fusion.service.IFusionNumService;
 import org.apache.commons.lang3.StringUtils;
@@ -15,6 +16,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,6 +37,8 @@ public class CaseFusionController extends BaseController{
     IFusionNumService fusionNumService;
     @Autowired
     IFusionMeterService fusionMeterService;
+    @Autowired
+    ICaseTagPointService caseTagPointService;
 
     @GetMapping("/list")
     public ResultData allList(@RequestParam(required = false) Integer caseId){
@@ -63,6 +67,7 @@ public class CaseFusionController extends BaseController{
         }
         FusionNum fusionNum = fusionNumService.getById(param.getFusionNumId());
         fusionMeterService.deleteByModelId(fusionNum.getModelId());
+        caseTagPointService.deleteByModelIds(Arrays.asList(fusionNum.getModelId()));
         fusionNumService.removeById(param.getFusionNumId());
         return ResultData.ok();
     }

src/main/java/com/fdkankan/fusion/service/impl/CaseViewServiceImpl.java

@@ -83,15 +83,13 @@ public class CaseViewServiceImpl extends ServiceImpl<ICaseViewMapper, CaseView>
     }
 
     @Override
-    public void deleteByNumList(Integer caseId, List<String> updateNumList) {
-        LambdaQueryWrapper<CaseView> queryW = new LambdaQueryWrapper<>();
-        queryW.eq(CaseView::getCaseId,caseId);
-        if(updateNumList.size()<=0){
-            this.remove(queryW);
+    public void deleteByNumList(Integer caseId, List<String> delNumList) {
+        if(delNumList.size()<=0){
             return;
         }
+        LambdaQueryWrapper<CaseView> queryW = new LambdaQueryWrapper<>();
+        queryW.eq(CaseView::getCaseId,caseId);
         List<CaseView> list = this.list(queryW);
-
         if(list.size() >0){
             List<String> numList = list.parallelStream().map(CaseView::getNum).collect(Collectors.toList());
             if(numList.size() >0){

src/main/java/com/fdkankan/fusion/service/impl/FusionNumServiceImpl.java

@@ -196,14 +196,13 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
      */
     @Override
     public void deleteByNumList(Integer caseId,List<String> deleteNum) {
+        if(deleteNum.size() <=0){
+            return;
+        }
         List<CaseFusion> caseFusionList = caseFusionService.getListByCaseId(caseId);
         if(caseFusionList.size() >0){
             List<Integer> fusionIds = caseFusionList.parallelStream().map(CaseFusion::getFusionId).collect(Collectors.toList());
             if(fusionIds.size() >0){
-                if(deleteNum.size() <=0){
-                    this.deleteByCaseId(caseId);
-                    return;
-                }
                 LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
                 wrapper.in(Model::getNum,deleteNum);
                 List<Model> list = modelService.list(wrapper);
@@ -211,9 +210,7 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
                 wrapper2.in(Model::getModelId,deleteNum);
                 List<Model> list2 = modelService.list(wrapper);
                 list.addAll(list2);
-
                 if(list.size()<=0){
-                    this.deleteByCaseId(caseId);
                     return;
                 }
                 List<Integer> modelIds = list.parallelStream().map(Model::getModelId).collect(Collectors.toList());