|
@@ -13,6 +13,7 @@ import com.fdkankan.fusion.common.PageInfo;
|
|
|
import com.fdkankan.fusion.common.util.*;
|
|
|
import com.fdkankan.fusion.common.FilePath;
|
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
|
+import com.fdkankan.fusion.entity.CaseEntity;
|
|
|
import com.fdkankan.fusion.entity.CaseNumEntity;
|
|
|
import com.fdkankan.fusion.entity.FusionNum;
|
|
|
import com.fdkankan.fusion.entity.Model;
|
|
@@ -22,6 +23,7 @@ import com.fdkankan.fusion.request.ModelPram;
|
|
|
import com.fdkankan.fusion.request.ScenePram;
|
|
|
import com.fdkankan.fusion.response.SceneVo;
|
|
|
import com.fdkankan.fusion.service.ICaseNumService;
|
|
|
+import com.fdkankan.fusion.service.ICaseService;
|
|
|
import com.fdkankan.fusion.service.IFusionNumService;
|
|
|
import com.fdkankan.fusion.service.IModelService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -33,6 +35,8 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.xml.transform.Result;
|
|
|
+
|
|
|
/**
|
|
|
* <p>
|
|
|
* 服务实现类
|
|
@@ -51,6 +55,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
@Autowired
|
|
|
ICaseNumService caseNumService;
|
|
|
@Autowired
|
|
|
+ ICaseService caseService;
|
|
|
+ @Autowired
|
|
|
IFusionNumService fusionNumService;
|
|
|
@Value("${local.obj_path}")
|
|
|
private String OBJ_PATH;
|
|
@@ -182,7 +188,17 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
List<CaseNumEntity> caseNumEntityList = caseNumService.getByNum(modelId.toString());
|
|
|
List<FusionNum> fusionNumList = fusionNumService.getByNum(modelId.toString());
|
|
|
if(caseNumEntityList.size() >0 || fusionNumList.size() >0){
|
|
|
- throw new BusinessException(ResultCode.CASE_USE);
|
|
|
+ List<Integer> caseIdIds = caseNumEntityList.parallelStream().map(CaseNumEntity::getCaseId).collect(Collectors.toList());
|
|
|
+ List<CaseEntity> list = caseService.getByIds(caseIdIds);
|
|
|
+ List<String> collect = list.parallelStream().map(CaseEntity::getCaseTitle).collect(Collectors.toList());
|
|
|
+ StringBuilder title = new StringBuilder();
|
|
|
+ for (String str : collect) {
|
|
|
+ title.append(str).append(",");
|
|
|
+ }
|
|
|
+ if(title.length()>0){
|
|
|
+ title.delete(title.length()-1,title.length());
|
|
|
+ }
|
|
|
+ throw new BusinessException(ResultCode.CASE_USE.code, String.format(ResultCode.CASE_USE.msg,title));
|
|
|
}
|
|
|
Model model = this.getById(modelId);
|
|
|
if(model == null ){
|