浏览代码

测量删除

lyhzzz 3 年之前
父节点
当前提交
ba82a697e1

+ 3 - 3
src/main/java/com/fdkankan/fusion/controller/CaseFusionController.java

@@ -64,9 +64,9 @@ public class CaseFusionController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         FusionNum fusionNum = fusionNumService.getById(param.getFusionNumId());
-        Integer modelId = fusionNum.getModelId();
-        fusionMeterService.deleteByModelId(modelId);
-        return ResultData.ok(fusionNumService.removeById(param.getFusionNumId() ));
+        fusionMeterService.deleteByFusionId(fusionNum.getFusionId());
+        fusionNumService.removeById(param.getFusionNumId());
+        return ResultData.ok();
     }
 }
 

+ 4 - 0
src/main/java/com/fdkankan/fusion/controller/ModelController.java

@@ -12,6 +12,7 @@ import com.fdkankan.fusion.request.ModelPram;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.service.ICaseFusionService;
 import com.fdkankan.fusion.service.ICaseNumService;
+import com.fdkankan.fusion.service.IFusionMeterService;
 import com.fdkankan.fusion.service.IModelService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@ public class ModelController {
 
     @Autowired
     IModelService modelService;
+    @Autowired
+    IFusionMeterService fusionMeterService;
 
 
     @PostMapping("/uploadObj")
@@ -59,6 +62,7 @@ public class ModelController {
             throw  new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         modelService.delete(param.getModelId());
+        fusionMeterService.deleteByModelId(param.getModelId());
         return ResultData.ok();
     }
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/IFusionMeterService.java

@@ -20,4 +20,6 @@ public interface IFusionMeterService extends IService<FusionMeter> {
     FusionMeter add(FusionMeter fusionMeter);
 
     void deleteByModelId(Integer modelId);
+
+    void deleteByFusionId(Integer fusionId);
 }

+ 7 - 0
src/main/java/com/fdkankan/fusion/service/impl/FusionMeterServiceImpl.java

@@ -55,4 +55,11 @@ public class FusionMeterServiceImpl extends ServiceImpl<IFusionMeterMapper, Fusi
         wrapper.like(FusionMeter::getPosition,"%\"modelId\":\""+modelId+"\"%");
         this.remove(wrapper);
     }
+
+    @Override
+    public void deleteByFusionId(Integer fusionId) {
+        LambdaQueryWrapper<FusionMeter> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FusionMeter::getFusionId,fusionId);
+        this.remove(wrapper);
+    }
 }