从融合场景中移除模型，删除测量结果

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.IFusionMeterService;
 import com.fdkankan.fusion.service.IFusionNumService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -32,6 +33,8 @@ public class CaseFusionController {
     ICaseFusionService caseFusionService;
     @Autowired
     IFusionNumService fusionNumService;
+    @Autowired
+    IFusionMeterService fusionMeterService;
 
     @GetMapping("/list")
     public ResultData allList(@RequestParam(required = false) Integer caseId,
@@ -60,6 +63,9 @@ public class CaseFusionController {
         if(param.getFusionNumId() == null){
             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() ));
     }
 }

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

@@ -1,33 +1,27 @@
 package com.fdkankan.fusion.controller;
 
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.ResultData;
-import com.fdkankan.fusion.common.util.RedisKeyUtil;
-import com.fdkankan.fusion.httpClient.client.FdKKClient;
-import com.fdkankan.fusion.httpClient.client.LaserClient;
-import com.fdkankan.fusion.httpClient.client.OverallClient;
-import com.fdkankan.fusion.httpClient.request.FdkkLoginRequest;
-import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
-import com.fdkankan.fusion.httpClient.response.FdkkResponse;
+import com.fdkankan.fusion.entity.FusionMeter;
+import com.fdkankan.fusion.service.IFusionMeterService;
 import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 @RestController
 public class TestController {
 
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    IFusionMeterService meterService;
 
     @RequestMapping("/test")
-    public String test(){
-        redisUtil.set(RedisKeyUtil.mergerVideoKey+1,"10");
-        return redisUtil.get(RedisKeyUtil.mergerVideoKey+1);
+    public ResultData test(){
+        LambdaQueryWrapper<FusionMeter> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(FusionMeter::getPosition,"%\"modelId\":\""+35+"\"%");
+        return ResultData.ok(meterService.list(wrapper));
     }
 
 

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

@@ -18,4 +18,6 @@ public interface IFusionMeterService extends IService<FusionMeter> {
     List<FusionMeter> getListByFusionId(Integer fusionId, String meterTitle);
 
     FusionMeter add(FusionMeter fusionMeter);
+
+    void deleteByModelId(Integer modelId);
 }

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

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