Merge branch 'release-深巡记录拍摄时长' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/entity/ScenePlus.java

src/main/java/com/fdkankan/contro/entity/ScenePlus.java

@@ -143,5 +143,11 @@ public class ScenePlus implements Serializable {
     @TableField("hesai_sn")
     private String hesaiSn;
 
+    /**
+     * 拍摄时长
+     */
+    @TableField("slam_duration")
+    private Integer slamDuration;
+
 
 }

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

@@ -480,7 +480,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, cameraDetail.getCameraId(), jsonObject.getString("creator"),
+        ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, jsonObject, cameraDetail.getCameraId(), jsonObject.getString("creator"),
                 jsonObject.getString("pwd"), cameraType, jsonObject.getJSONObject("cam").getIntValue("type"),
                 dataSource, icon, cameraDetail.getUserId(), userName, algorithm, jsonObject.getInteger("location"),
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
@@ -1009,7 +1009,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return ResultData.ok();
     }
 
-    public ScenePlusVO createScenePlus(String projectNum, Long cameraId, String phoneId, String sceneKey,
+    public ScenePlusVO createScenePlus(String projectNum, JSONObject fdage, Long cameraId, String phoneId, String sceneKey,
                                        Long cameraType, int camType, String dataSource, String pic, Long userId, String userName,
                                        String algorithm, Integer location, Integer sceneShootCount, String sceneName,
                                        String sceneDec, Integer sceneType, String gps, Integer type,
@@ -1027,6 +1027,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlusExt.setDataSource(dataSource);
         scenePlusExt.setLocation(location);
         scenePlusExt.setModelKind(ModelKind.DAM.code());
+        scenePlus.setSlamDuration(fdage.getInteger("slamDuration"));
         if (sceneName != null) {
             scenePlus.setTitle(sceneName);
             scenePlus.setLaserTitle(sceneName);
@@ -2209,7 +2210,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         sceneEditControlsService.saveOrUpdate(sceneEditControls);
 
         //上传data.fdage和custom.txt到home目录
-        String homePath = dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX);
+//        String homePath = dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX);
+        String homePath = SceneUtil.getHomePath(dataSource);
         fYunFileService.uploadFile(dataFdageStr.getBytes(StandardCharsets.UTF_8), homePath + "data.fdage");
         fYunFileService.uploadFile(ossPath.getBytes(StandardCharsets.UTF_8), homePath + "custom.txt");