1

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

@@ -68,7 +68,6 @@ public class ModelController extends BaseController{
             throw  new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         modelService.delete(param.getModelId());
-        fusionNumService.deleteByModelId(param.getModelId());
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/fusion/service/ICaseNumService.java

@@ -28,5 +28,5 @@ public interface ICaseNumService extends IService<CaseNumEntity> {
 
     List<CaseNumEntity> getByNum(String num);
 
-    void deleteByNum(String num);
+    void deleteByNum(Integer caseId,List<String> num);
 }

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

@@ -173,14 +173,14 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
         return addList;
     }
 
-    private void deleteByNum(Integer caseId, List<String> delList) {
+    @Override
+    public void deleteByNum(Integer caseId, List<String> delList) {
         if(delList.size() >0){
             LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(CaseNumEntity::getCaseId,caseId);
             wrapper.in(CaseNumEntity::getNum,delList);
             this.remove(wrapper);
             fusionNumService.deleteByNumList(caseId,delList);
-            caseViewService.deleteByNumList(caseId,delList);
         }
     }
 
@@ -220,18 +220,4 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
         return this.list(wrapper);
     }
 
-    @Override
-    public void deleteByNum(String num) {
-        LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CaseNumEntity::getNum,num);
-        this.remove(wrapper);
-        List<Model> modelList = modelService.getListByNum(Arrays.asList(num));
-        if(modelList.size() >0){
-            for (Model model : modelList) {
-                fusionNumService.deleteByModelId(model.getModelId());
-            }
-        }
-        caseViewService.deleteByNum(num);
-
-    }
 }

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

@@ -113,11 +113,13 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         }
         if(kkNumList.size() >0){
             List<String> numList = listAll.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+            List<String> delNumList = new ArrayList<>();
             for (String num : kkNumList) {
                 if(!numList.contains(num)){
-                    caseNumService.deleteByNum(num);
+                    delNumList.add(num);
                 }
             }
+            caseNumService.deleteByNum(param.getCaseId(),delNumList);
         }
 
         List<String> numList = param.getTypeMap().get(3);       //关联的三维模型

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

@@ -3,13 +3,16 @@ package com.fdkankan.fusion.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.entity.CaseView;
 import com.fdkankan.fusion.mapper.ICaseViewMapper;
 import com.fdkankan.fusion.service.ICaseViewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fusion.service.IModelService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Case;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

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

@@ -45,6 +45,8 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
     IFusionMeterService fusionMeterService;
     @Autowired
     ICaseTagPointService caseTagPointService;
+    @Autowired
+    ICaseViewService caseViewService;
 
     @Override
     public List<FusionNum> getByNum(String num) {
@@ -224,7 +226,7 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
                 this.remove(deleteWr);
             }
         }
-
+        caseViewService.deleteByNumList(caseId,deleteNum);
     }
 
     @Override