|
@@ -476,7 +476,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
}
|
|
|
String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
|
|
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"),
|
|
jsonObject.getString("pwd"), cameraType, jsonObject.getJSONObject("cam").getIntValue("type"),
|
|
|
dataSource, icon, cameraDetail.getUserId(), userName, algorithm, jsonObject.getInteger("location"),
|
|
dataSource, icon, cameraDetail.getUserId(), userName, algorithm, jsonObject.getInteger("location"),
|
|
|
jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
|
|
jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
|
|
@@ -981,7 +981,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
return ResultData.ok();
|
|
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,
|
|
Long cameraType, int camType, String dataSource, String pic, Long userId, String userName,
|
|
|
String algorithm, Integer location, Integer sceneShootCount, String sceneName,
|
|
String algorithm, Integer location, Integer sceneShootCount, String sceneName,
|
|
|
String sceneDec, Integer sceneType, String gps, Integer type,
|
|
String sceneDec, Integer sceneType, String gps, Integer type,
|
|
@@ -999,6 +999,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
scenePlusExt.setDataSource(dataSource);
|
|
scenePlusExt.setDataSource(dataSource);
|
|
|
scenePlusExt.setLocation(location);
|
|
scenePlusExt.setLocation(location);
|
|
|
scenePlusExt.setModelKind(ModelKind.DAM.code());
|
|
scenePlusExt.setModelKind(ModelKind.DAM.code());
|
|
|
|
|
+ scenePlus.setSlamDuration(fdage.getInteger("slamDuration"));
|
|
|
if (sceneName != null) {
|
|
if (sceneName != null) {
|
|
|
scenePlus.setTitle(sceneName);
|
|
scenePlus.setTitle(sceneName);
|
|
|
scenePlus.setLaserTitle(sceneName);
|
|
scenePlus.setLaserTitle(sceneName);
|