更换场景主表

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -42,6 +42,8 @@ public class SceneController {
     IPicSceneProgressService picSceneProgressService;
     @Autowired
     ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    IScenePlusService scenePlusService;
 
 
 //    /**
@@ -240,24 +242,7 @@ public class SceneController {
      */
     @PostMapping(value = "/check/key")
     public ResultData checkKey(@RequestBody @Validated SceneCheckKeyParamVO param) throws Exception {
-        ScenePro scenePro = sceneProService.getOne(
-            new LambdaQueryWrapper<ScenePro>()
-                .eq(ScenePro::getNum, param.getNum())
-                .eq(ScenePro::getPayStatus,PayStatus.PAY.code()));
-        if (Objects.isNull(scenePro)) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getBySceneProId(scenePro.getId());
-
-        if (Objects.isNull(sceneEditInfo)) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-
-        if(!param.getPassword().equals(sceneEditInfo.getScenePassword())){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5021);
-        }
-
-        return ResultData.ok();
+        return scenePlusService.checkKey(param);
     }
 
 //    /**

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -3,6 +3,9 @@ package com.fdkankan.scene.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.ScenePlus;
+import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -18,4 +21,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData resetSpace(String num) throws Exception;
 
+    ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -139,7 +139,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<String> findByCameraId(Long cameraId) throws Exception;
 
-    ResultData uploadObjAndImg(String sceneNum, MultipartFile file) throws Exception;
+    ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception;
 
     ResultData uploadLogoBottomStatus(FileParamVO param) throws Exception;
 
@@ -195,7 +195,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     ResultData checkVideoUrl(FileParamVO param);
 
-    ResultData downloadTexData(String sceneNum) throws Exception ;
+    ResultData downloadTexData(String num) throws Exception ;
 
     ResultData downloadCapture(@RequestBody SceneParamVO param) throws Exception;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -409,7 +409,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
      **/
     private SceneInfoVO getSceneInfo4View(String num) throws Exception{
 
-        ScenePro scenePro = sceneProService.findBySceneNum(num);
+//        ScenePro scenePro = sceneProService.findBySceneNum(num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
 
         String key = String.format(RedisKey.SCENE_JSON, num);
         String sceneJson = redisUtil.get(key);
@@ -417,7 +418,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //先查询redis
         if(StrUtil.isNotEmpty(sceneJson)){
             sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
-            this.setExtData(sceneInfoVO, scenePro.getCameraId());
+            this.setExtData(sceneInfoVO, scenePlus.getCameraId());
             return sceneInfoVO;
         }
 
@@ -427,7 +428,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(StrUtil.isEmpty(objectContent))
             return null;
         sceneInfoVO = JSON.parseObject(objectContent, SceneInfoVO.class);
-        this.setExtData(sceneInfoVO, scenePro.getCameraId());
+        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
         redisUtil.set(key, JSON.toJSONString(sceneInfoVO));
 
         return sceneInfoVO;
@@ -570,11 +571,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public ResultData resetCad(String num){
 
-        ScenePro scenePro = sceneProService.findBySceneNum(num);
-        if(Objects.isNull(scenePro))
+//        ScenePro scenePro = sceneProService.findBySceneNum(num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(Objects.isNull(scenePlus))
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        SceneEditInfo sceneEditInfoDb = this.getBySceneProId(scenePro.getId());
+        SceneEditInfo sceneEditInfoDb = this.getByScenePlusId(scenePlus.getId());
         if(Objects.nonNull(sceneEditInfoDb)){
             LambdaUpdateWrapper<SceneEditInfo> updateWrapper = new LambdaUpdateWrapper<SceneEditInfo>()
                 .setSql("version=version+" + 1)
@@ -583,7 +585,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             this.update(updateWrapper);
         }else{
             sceneEditInfoDb = new SceneEditInfo();
-            sceneEditInfoDb.setSceneProId(scenePro.getId());
+            sceneEditInfoDb.setScenePlusId(scenePlus.getId());
             sceneEditInfoDb.setFloorPlanUser(CommonStatus.NO.code());
             this.save(sceneEditInfoDb);
         }
@@ -773,11 +775,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(StrUtil.isEmpty(sid)){
             throw new BusinessException(ErrorCode.PARAM_REQUIRED);
         }
-        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
-        if(Objects.isNull(scenePro))
+//        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if(Objects.isNull(scenePlus))
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
+        SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
 
         //转换视频格式
         this.transferToFlv(param.getNum(), param.getFileName());
@@ -786,7 +789,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         String boxVideos = this.createBoxVideos(sid, boxVideo, sceneEditInfo, OperationType.ADDORUPDATE.code());
 
         //更新数据库
-        this.updateBoxVideos(sceneEditInfo, scenePro.getId(), boxVideos);
+        this.updateBoxVideos(sceneEditInfo, scenePlus.getId(), boxVideos);
 
         return ResultData.ok();
     }
@@ -794,17 +797,18 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public ResultData deleteVideoBox(DeleteVidoeBoxParamVO param) throws Exception {
 
-        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
-        if(Objects.isNull(scenePro))
+//        ScenePro scenePro = sceneProService.findBySceneNum(param.getNum());
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if(Objects.isNull(scenePlus))
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
+        SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
 
         //根据sid移除json
         String boxVideos = this.createBoxVideos(param.getSid(), null, sceneEditInfo, OperationType.DELETE.code());
 
         //写数据库
-        this.updateBoxVideos(sceneEditInfo,scenePro.getId(),boxVideos);
+        this.updateBoxVideos(sceneEditInfo,scenePlus.getId(),boxVideos);
 
         return ResultData.ok();
     }
@@ -820,20 +824,21 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     }
 
     @Override
-    public ResultData uploadBallScreenVideo(String num, String fileName, MultipartFile file)
-        throws Exception {
+    public ResultData uploadBallScreenVideo(String num, String fileName, MultipartFile file) throws Exception {
 
         if(!fileName.endsWith(".mp4")){
             throw new BusinessException(ErrorCode.FAILURE_CODE_7007.code(), ErrorCode.FAILURE_CODE_7007.formatMessage("mp4"));
         }
 
-        ScenePro scenePro = sceneProService.findBySceneNum(num);
-        if(scenePro == null){
+//        ScenePro scenePro = sceneProService.findBySceneNum(num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(scenePlus == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+//        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
-        String path = sceneProExt.getDataSource();
+        String path = scenePlusExt.getDataSource();
 
         if(path != null && !"".equals(path) && path.startsWith("http")){
             path = ConstantFilePath.BUILD_MODEL_PATH + File.separator + path.split("/")[path.split("/").length - 2];
@@ -900,18 +905,20 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
         try {
 
-            ScenePro scenePro = sceneProService.findBySceneNum(num);
-            if(scenePro == null){
+//            ScenePro scenePro = sceneProService.findBySceneNum(num);
+            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+            if(scenePlus == null){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
             }
-            SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+//            SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
             //更新scene.json文件
             String strsceneInfos = FileUtils.readFile(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "scene.json");
             if(strsceneInfos == null)
                 new File(ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "scene.json").createNewFile();
 
-            String path = sceneProExt.getDataSource();//   /mnt/data/0662c5389/831989883441512448/4898cab04f8c_202104141602356060/
+            String path = scenePlusExt.getDataSource();//   /mnt/data/0662c5389/831989883441512448/4898cab04f8c_202104141602356060/
             if(path != null && !"".equals(path) && path.startsWith("http")){
                 path = ConstantFilePath.BUILD_MODEL_PATH + File.separator + path.split("/")[path.split("/").length - 2];
             }
@@ -1001,7 +1008,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 files[i].transferTo(cadImg);
             }
             //下载封面图
-            FileUtils.downLoadFromUrl(scenePro.getThumb() + "?t=" + System.currentTimeMillis(),
+            FileUtils.downLoadFromUrl(scenePlusExt.getThumb() + "?t=" + System.currentTimeMillis(),
                 "Cover.png", target + File.separator + "extras" + File.separator + "CoverImage");
             //转换成jpg
             FileUtils.pngToJpg(target + File.separator + "extras" + File.separator + "CoverImage/Cover.png",
@@ -1065,10 +1072,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         return ResultData.ok();
     }
 
-    private void updateBoxVideos(SceneEditInfo sceneEditInfo, Long sceneProId, String boxVideos){
+    private void updateBoxVideos(SceneEditInfo sceneEditInfo, Long scenePlusId, String boxVideos){
         if(Objects.isNull(sceneEditInfo)){
             sceneEditInfo = new SceneEditInfo();
-            sceneEditInfo.setSceneProId(sceneProId);
+            sceneEditInfo.setScenePlusId(scenePlusId);
             sceneEditInfo.setBoxVideos(boxVideos);
             this.save(sceneEditInfo);
         }else{

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -2,16 +2,21 @@ package com.fdkankan.scene.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.PayStatus;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
+import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.entity.SceneProExt;
 import com.fdkankan.scene.mapper.IScenePlusMapper;
+import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import java.util.Calendar;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +39,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private IScenePlusExtService scenePlusExtService;
     @Autowired
     private PlatformGoodsClient platformGoodsClient;
+    @Autowired
+    private IScenePlusService scenePlusService;
+    @Autowired
+    ISceneEditInfoService sceneEditInfoService;
 
     @Override
     public ScenePlus getScenePlusByNum(String num) {
@@ -59,4 +68,29 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         return ResultData.ok();
     }
+
+    @Override
+    public ResultData checkKey(SceneCheckKeyParamVO param) throws Exception {
+//        ScenePro scenePro = sceneProService.getOne(
+//            new LambdaQueryWrapper<ScenePro>()
+//                .eq(ScenePro::getNum, param.getNum())
+//                .eq(ScenePro::getPayStatus, PayStatus.PAY.code()));
+        ScenePlus scenePlus = scenePlusService.getOne(new LambdaQueryWrapper<ScenePlus>()
+            .eq(ScenePlus::getNum, param.getNum())
+            .eq(ScenePlus::getPayStatus, PayStatus.PAY.code()));
+        if (Objects.isNull(scenePlus)) {
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+
+        if (Objects.isNull(sceneEditInfo)) {
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+
+        if(!param.getPassword().equals(sceneEditInfo.getScenePassword())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5021);
+        }
+
+        return ResultData.ok();
+    }
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -2214,8 +2214,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public ResultData addOrUpdateTag(SaveTagsParamVO param) throws Exception {
 
-        ScenePro scenePro = this.findBySceneNum(param.getNum());
-        if (scenePro == null)
+//        ScenePro scenePro = this.findBySceneNum(param.getNum());
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if (scenePlus == null)
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
 
         this.addOrUpdateHotData(param.getNum(), param.getHotDataList());
@@ -2272,8 +2273,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public ResultData deleteTag(DeleteHotParamVO param) throws Exception {
 
-        ScenePro scenePro = this.findBySceneNum(param.getNum());
-        if (scenePro == null)
+//        ScenePro scenePro = this.findBySceneNum(param.getNum());
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if (scenePlus == null)
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
 
         List<String> deleteSidList = param.getSidList();
@@ -3387,23 +3389,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public ResultData uploadObjAndImg(String sceneNum, MultipartFile file) throws Exception{
-        if(StrUtil.isEmpty(sceneNum)){
+    public ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception{
+        if(StrUtil.isEmpty(num)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
 
-        ScenePro scenePro = this.findBySceneNum(sceneNum);
-        if(scenePro == null){
+//        ScenePro scenePro = this.findBySceneNum(num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(scenePlus == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+//        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
         if (file == null || file.getSize() <= 0) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_5012);
         }
 
         //文件上传的位置可以自定义
-        String path = sceneProExt.getDataSource() + "_obj2txt";
+        String path = scenePlusExt.getDataSource() + "_obj2txt";
         String zipPath = path + "/zip/";
         String filePath =  path + "/extras/";
         String resultPath = path + "/results/";
@@ -3415,21 +3419,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.writeDataJson(path);
 
         //调用算法,不同的类型调用不同的算法
-        if("V2".equals(scenePro.getBuildType())){
+        if("V2".equals(scenePlusExt.getBuildType())){
             CreateObjUtil.objToTxt(path , "1");
         }
-        if("V3".equals(scenePro.getBuildType())){
+        if("V3".equals(scenePlusExt.getBuildType())){
             CreateObjUtil.build3dModel(path , "1");
         }
 
         //算法计算完后，生成压缩文件，上传到oss
-        this.uploadFileofterRebuildPanoram(path, sceneNum);
+        this.uploadFileofterRebuildPanoram(path, num);
 
         //更新版本信息
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getBySceneProId(scenePro.getId());
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         if(Objects.isNull(sceneEditInfo)){
             sceneEditInfo = new SceneEditInfo();
-            sceneEditInfo.setSceneProId(scenePro.getId());
+            sceneEditInfo.setScenePlusId(scenePlus.getId());
             sceneEditInfo.setFloorPublishVer(1);
             sceneEditInfo.setFloorEditVer(1);
             sceneEditInfo.setIsUploadObj(CommonStatus.YES.code());
@@ -4747,28 +4751,30 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return ResultData.ok(html);
     }
 
-    public ResultData downloadTexData(String sceneNum) throws Exception {
+    public ResultData downloadTexData(String num) throws Exception {
 
-        if(StrUtil.isEmpty(sceneNum)){
+        if(StrUtil.isEmpty(num)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }
-        ScenePro scenePro = this.findBySceneNum(sceneNum);
-        if(scenePro == null){
+//        ScenePro scenePro = this.findBySceneNum(num);
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        if(scenePlus == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+//        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getBySceneProId(scenePro.getId());
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
 
-        String localImagePath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, sceneNum);
+        String localImagePath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, num);
         if(!new File(localImagePath).exists()){
             new File(localImagePath).mkdirs();
         }
 
 
-        String newData =  sceneProExt.getDataSource() + "_obj2txt/extras";
-        String newResultData = sceneProExt.getDataSource() + "_obj2txt/results/upload.json";
-        String zipName = sceneNum + "_extras.zip";
+        String newData =  scenePlusExt.getDataSource() + "_obj2txt/extras";
+        String newResultData = scenePlusExt.getDataSource() + "_obj2txt/results/upload.json";
+        String zipName = num + "_extras.zip";
         String zipPath = localImagePath + zipName;
         //如果用户上传过模型，就打包上传到oss，直接返回
         if(CommonStatus.YES.code().equals(sceneEditInfo.getIsUploadObj())
@@ -4783,11 +4789,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
 
-        String buildType = scenePro.getBuildType();
+        String buildType = scenePlusExt.getBuildType();
         if("V3".equals(buildType)){
-            String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, sceneNum);
+            String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
             //V3版本去oss下载2048模型
-            String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, sceneNum) + "mesh";
+            String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "mesh";
             FileUtils.deleteDirectory(meshPath);
             CreateObjUtil.ossUtilCp(dataViewPath + "mesh", meshPath);
             log.info("meshPath="+meshPath.concat("/mesh"));
@@ -4817,8 +4823,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         //V2版本在本地获取模型资源
         //修改过的资源
-        String editData =  sceneProExt.getDataSource() + "_edit/caches/tex";
-        String results = sceneProExt.getDataSource() + "_edit/results";
+        String editData =  scenePlusExt.getDataSource() + "_edit/caches/tex";
+        String results = scenePlusExt.getDataSource() + "_edit/results";
         if (new File(editData).exists() && new File(results).exists()){
             for(File file : new File(editData).listFiles()){
                 if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
@@ -4839,7 +4845,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         //没上传过返回源资源
-        String dataPath = sceneProExt.getDataSource() + "/caches/tex";
+        String dataPath = scenePlusExt.getDataSource() + "/caches/tex";
         File dataFile = new File(dataPath);
         if(!dataFile.exists()){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3018);