|
@@ -14,11 +14,8 @@ import com.fdkankan.fusion.request.CaseParam;
|
|
import com.fdkankan.fusion.request.FusionParam;
|
|
import com.fdkankan.fusion.request.FusionParam;
|
|
import com.fdkankan.fusion.response.FusionNumVo;
|
|
import com.fdkankan.fusion.response.FusionNumVo;
|
|
import com.fdkankan.fusion.response.SceneVo;
|
|
import com.fdkankan.fusion.response.SceneVo;
|
|
-import com.fdkankan.fusion.service.ICaseFusionService;
|
|
|
|
-import com.fdkankan.fusion.service.ICaseService;
|
|
|
|
-import com.fdkankan.fusion.service.IFusionNumService;
|
|
|
|
|
|
+import com.fdkankan.fusion.service.*;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
-import com.fdkankan.fusion.service.IModelService;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -44,6 +41,8 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
|
|
ICaseService caseService;
|
|
ICaseService caseService;
|
|
@Autowired
|
|
@Autowired
|
|
IModelService modelService;
|
|
IModelService modelService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IFusionMeterService fusionMeterService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<FusionNum> getByNum(String num) {
|
|
public List<FusionNum> getByNum(String num) {
|
|
@@ -214,6 +213,11 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
|
|
LambdaQueryWrapper<FusionNum> deleteWr = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<FusionNum> deleteWr = new LambdaQueryWrapper<>();
|
|
deleteWr.in(FusionNum::getFusionId,fusionIds);
|
|
deleteWr.in(FusionNum::getFusionId,fusionIds);
|
|
deleteWr.notIn(FusionNum::getModelId,modelIds);
|
|
deleteWr.notIn(FusionNum::getModelId,modelIds);
|
|
|
|
+ List<FusionNum> list1 = this.list(deleteWr);
|
|
|
|
+ for (FusionNum fusionNum : list1) {
|
|
|
|
+ fusionMeterService.deleteByModelId(fusionNum.getModelId());
|
|
|
|
+
|
|
|
|
+ }
|
|
this.remove(deleteWr);
|
|
this.remove(deleteWr);
|
|
}
|
|
}
|
|
}
|
|
}
|