lyhzzz 2 vuotta sitten
vanhempi
commit
212d86a20b

+ 1 - 0
src/main/java/com/fdkankan/fusion/common/ResultCode.java

@@ -23,6 +23,7 @@ public enum ResultCode {
     SCENE_NOT_EXIST(7015,"当前场景已被删除"),
     UPLOAD_FILE_CHINA_NAME(7016,"文件名不能包含中文"),
     UPLOAD_FILE_NAME_TO_LONG(7017,"文件名超过长度限制"),
+    SCENE_DATA_SOURCE_EMPTY(7018,"场景资源文件为空,无法添加"),
 
     HOT_ICON_NOT_EXIST(7004,"热点icon不存在");
 

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

@@ -3,22 +3,26 @@ package com.fdkankan.fusion.service.impl;
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.FileWriterUtil;
 import com.fdkankan.fusion.common.util.OBJToGLBUtil;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.entity.CaseNumEntity;
 import com.fdkankan.fusion.entity.Model;
+import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
 import com.fdkankan.fusion.mapper.ICaseNumMapper;
 import com.fdkankan.fusion.request.SceneNumParam;
 import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.sql.BatchUpdateException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -119,6 +123,9 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
 
     private void getGlbSsObj(Model model, String num) {
         String dataSource = fdKKClient.querySceneDataSource(num);
+        if(StringUtils.isBlank(dataSource)){
+            throw new BusinessException(ResultCode.SCENE_DATA_SOURCE_EMPTY.code,num +ResultCode.SCENE_DATA_SOURCE_EMPTY.msg);
+        }
         String meshPath = dataSource +"/results/mesh";
 
         String objPath = String.format(FilePath.OBJ_LOCAL_PATH ,environment,num);