Merge branch 'feature-slimming-nas-20220130-dsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -257,11 +257,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //写入数据库
             this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),isObj,scenePlusExt);
 
-            Object[] editInfoArr = this.updateEditInfo(scenePlus);
-            SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
-            SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
-            SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
-
             //上传全景图俯视图
             this.uploadFloorCad(path, sceneCode, uploadFiles);
 
@@ -303,9 +298,18 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //重置异步操作记录
             this.removeSceneAsynOperLog(sceneCode);
 
-            log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
-            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
-            Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
+            //清除用户编辑业务数据
+            Set<String> bizs = new HashSet<>();
+            bizs.add(UserEditDataType.BOX_MODEL.message());
+            commonService.initUserEditData(sceneCode, bizs, null);
+
+            //上传计算结果文件
+            commonService.uploadBuildResultData(sceneCode, path, SceneVersionType.V4.code());
+
+            Object[] editInfoArr = this.updateEditInfo(scenePlus);
+            SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
+            SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
+            SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
 
             if (cameraType == 14) {
                 //计算成功  激光转台相机 同步 请求
@@ -317,7 +321,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 fdkkLaserService.cloudPointBuild(sceneCode,path);
             }
 
-
+            log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+            Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
             //写scene.json
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
@@ -332,18 +338,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             String pushToken = fdageData.getString("pushToken");
             this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
-            //上传计算结果文件
-            commonService.uploadBuildResultData(sceneCode, path, SceneVersionType.V4.code());
-
-            //删除计算目录
             //更新场景主表
             scenePlusService.updateById(scenePlus);
 
-            //清除用户编辑业务数据
-            Set<String> bizs = new HashSet<>();
-            bizs.add(UserEditDataType.BOX_MODEL.message());
-            commonService.initUserEditData(sceneCode, bizs, null);
-
+            //删除计算目录
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
 
             log.info("场景计算结果处理结束，场景码：{}", sceneCode);