1

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

@@ -45,7 +45,6 @@ public class CaseController {
 
     @PostMapping("/delete")
     public ResultData delete(@RequestBody CaseParam param, @RequestHeader String token){
-
         caseService.delete(param.getCaseId());
         return ResultData.ok();
     }

src/main/java/com/fdkankan/fusion/entity/FusionNum.java

@@ -71,5 +71,7 @@ public class FusionNum implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("tb_status")
+    private Integer tbStatus;
 
 }

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

@@ -22,7 +22,7 @@ public interface ICaseNumService extends IService<CaseNumEntity> {
 
     void addBatch(Integer caseId, List<SceneNumParam> sceneNumParam);
 
-    void deleteByCaseId(Integer caseId);
+    void deleteByCaseId(Integer caseId,Boolean rest);
 
     HashMap<Integer, List<String>> getTypeMap(Integer caseId);
 

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

@@ -26,4 +26,6 @@ public interface IFusionNumService extends IService<FusionNum> {
     FusionNumVo add(FusionParam param);
 
     void updateModel(FusionParam param);
+
+    void deleteByCaseId(Integer caseId);
 }

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

@@ -9,8 +9,10 @@ import com.fdkankan.fusion.entity.CaseNumEntity;
 import com.fdkankan.fusion.entity.Model;
 import com.fdkankan.fusion.mapper.ICaseNumMapper;
 import com.fdkankan.fusion.request.SceneNumParam;
+import com.fdkankan.fusion.service.ICaseFusionService;
 import com.fdkankan.fusion.service.ICaseNumService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fusion.service.IFusionNumService;
 import com.fdkankan.fusion.service.IModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,6 +46,8 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     private String queryPath;
     @Autowired
     IModelService modelService;
+    @Autowired
+    IFusionNumService fusionNumService;
 
     @Override
     public List<CaseNumEntity> getByCaseId(Integer caseId) {
@@ -56,7 +60,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     @Override
     public void addBatch(Integer caseId, List<SceneNumParam> sceneNumParam) {
 
-        this.deleteByCaseId(caseId);
+        this.deleteByCaseId(caseId,true);
 
         List<CaseNumEntity> newCaseNums = new ArrayList<>();
         List<Model> modelList = new ArrayList<>();
@@ -122,14 +126,12 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     }
 
     @Override
-    public void deleteByCaseId(Integer caseId) {
+    public void deleteByCaseId(Integer caseId,Boolean rest) {
         LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseNumEntity::getCaseId,caseId);
-        List<CaseNumEntity> list = this.list(wrapper);
-        if(list.size() >0){
-            List<String> numList = list.parallelStream().map(CaseNumEntity::getNum).collect(Collectors.toList());
-            modelService.deleteByNum(numList);
-            this.remove(wrapper);
+        this.remove(wrapper);
+        if(!rest){
+            fusionNumService.deleteByCaseId(caseId);
         }
     }
 

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

@@ -144,7 +144,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         //删除关联的场景
-        caseNumService.deleteByCaseId(caseId);
+        caseNumService.deleteByCaseId(caseId,false);
 
         this.removeById(caseId);
     }

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

@@ -164,4 +164,17 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
         }
         this.update(wrapper);
     }
+
+    @Override
+    public void deleteByCaseId(Integer caseId) {
+        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){
+                LambdaQueryWrapper<FusionNum> wrapper = new LambdaQueryWrapper<>();
+                wrapper.in(FusionNum::getFusionId,fusionIds);
+                this.remove(wrapper);
+            }
+        }
+    }
 }