|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fdkankan.fusion.common.ResultCode;
|
|
|
import com.fdkankan.fusion.common.ResultData;
|
|
|
+import com.fdkankan.fusion.common.util.NumTypeUtils;
|
|
|
import com.fdkankan.fusion.entity.*;
|
|
|
import com.fdkankan.fusion.exception.BusinessException;
|
|
|
import com.fdkankan.fusion.common.PageInfo;
|
|
@@ -98,12 +99,16 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
|
|
|
if(numList ==null || numList.size() <=0 || type ==3){
|
|
|
continue;
|
|
|
}
|
|
|
+ if(param.getIsMesh()!=null && param.getIsMesh() == 1 && NumTypeUtils.isLaser(type)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
ScenePram scenePram = new ScenePram();
|
|
|
scenePram.setType(type);
|
|
|
scenePram.setPageNum(1);
|
|
|
scenePram.setPageSize(99999);
|
|
|
scenePram.setNumList(param.getTypeMap().get(type));
|
|
|
scenePram.setShare("1");
|
|
|
+ scenePram.setSceneName(param.getSceneName());
|
|
|
PageInfo pageInfo = sceneService.pageList(scenePram);
|
|
|
List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
|
|
|
listAll.addAll(list1);
|
|
@@ -140,14 +145,16 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
|
|
|
listAll.removeIf(sceneVo -> !sceneVo.getBind());
|
|
|
|
|
|
//关联的三维模型
|
|
|
- List<String> numList = param.getTypeMap().get(3);
|
|
|
- if(numList!=null && numList.size() >0){
|
|
|
- List<Model> models = modelService.getListByModelIdStrs(numList);
|
|
|
- for (Model model : models) {
|
|
|
- SceneVo sceneVo = new SceneVo();
|
|
|
- sceneVo.setStatus(2);
|
|
|
- BeanUtils.copyProperties(model,sceneVo);
|
|
|
- listAll.add(sceneVo);
|
|
|
+ if(param.getIsMesh() == null ){
|
|
|
+ List<String> numList = param.getTypeMap().get(3);
|
|
|
+ if(numList!=null && numList.size() >0){
|
|
|
+ List<Model> models = modelService.getListByModelIdStrs(numList);
|
|
|
+ for (Model model : models) {
|
|
|
+ SceneVo sceneVo = new SceneVo();
|
|
|
+ sceneVo.setStatus(2);
|
|
|
+ BeanUtils.copyProperties(model,sceneVo);
|
|
|
+ listAll.add(sceneVo);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
Set<String> snList = listAll.stream().filter(entity ->StringUtils.isNotBlank(entity.getSnCode()))
|