1111

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -270,7 +270,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             log.error("大场景序号为空：" + sceneNum);
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-
+        String dataSource = cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
+                fileId + File.separator + unicode;
+        if (cameraType == 14) {
+            dataSource = ConstantFilePath.BUILD_MODEL_LASER_PATH +dataSource;
+        } else {
+            dataSource = ConstantFilePath.BUILD_MODEL_PATH + dataSource;
+        }
 
         String localDataPath = String.format(ConstantFilePath.DATABUFFER_FORMAT, sceneNum);
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
@@ -314,7 +320,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
 
         ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
-                jsonObject.getString("pwd"), unicode,cameraType, fileId, icon,  cameraDetail.getUserId(), userName,algorithm,
+                jsonObject.getString("pwd"), unicode,cameraType, dataSource, icon,  cameraDetail.getUserId(), userName,algorithm,
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
@@ -443,7 +449,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     public ScenePlusVO createScenePlus(String projectNum, Long cameraId, String cameraName, String phoneId, String sceneKey,
-                                     String unicode, Long cameraType, String fileId, String pic, Long userId, String userName,
+                                     String unicode, Long cameraType, String dataSource, String pic, Long userId, String userName,
                                      String algorithm, Integer sceneShootCount, String sceneName,
                                      String sceneDec, Integer sceneType, String gps,Integer type,
                                      Integer resolution, String firmwareVersion, String url, String buildType,
@@ -457,7 +463,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlus.setPhoneId(phoneId);
         scenePlus.setNum(projectNum);
         scenePlus.setSceneSource(1);
-        scenePlusExt.setDataSource(ConstantFilePath.BUILD_MODEL_PATH + cameraName.toLowerCase() + File.separator + fileId + File.separator + unicode);
+        scenePlusExt.setDataSource(dataSource);
 
         if(resolution == null || resolution.intValue() == 0){
             scenePlusExt.setSceneScheme(cameraType.intValue());