|
@@ -798,45 +798,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
scene.setSpace(0L);
|
|
scene.setSpace(0L);
|
|
|
|
|
|
scene.setSceneSource(1);
|
|
scene.setSceneSource(1);
|
|
- if(cameraType.longValue() == 5 || cameraType.longValue() == 6){
|
|
|
|
- //场景来源双目相机
|
|
|
|
- scene.setSceneSource(2);
|
|
|
|
- scene.setDataSource(ConstantFilePath.BUILD_MODEL_PATH + unicode);
|
|
|
|
- }else if(cameraType.longValue() == 14){
|
|
|
|
-
|
|
|
|
- scene.setDataSource(ConstantFilePath.BUILD_MODEL_LASER_PATH +
|
|
|
|
- cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
|
|
|
|
- fileId + File.separator + unicode);
|
|
|
|
- log.info("激光相机 dataSource :" + scene.getDataSource());
|
|
|
|
-
|
|
|
|
- }else if(cameraType.longValue() >= 3){
|
|
|
|
- scene.setDataSource(ConstantFilePath.BUILD_MODEL_PATH +
|
|
|
|
- cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
|
|
|
|
- fileId + File.separator + unicode);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if(resolution == null || resolution.intValue() == 0){
|
|
|
|
- scene.setSceneScheme(cameraType.intValue());
|
|
|
|
- }else {
|
|
|
|
- scene.setSceneScheme(4);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- //场景来源双目相机,sceneScheme为4,加载high,low图
|
|
|
|
- if(cameraType.longValue() == 5 || cameraType.longValue() == 6){
|
|
|
|
- scene.setSceneScheme(4);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- //转台相机用4k图
|
|
|
|
- if(cameraType.longValue() == 13 ){
|
|
|
|
- scene.setSceneSource(3);
|
|
|
|
- scene.setSceneScheme(10);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- //激光相机
|
|
|
|
- if(cameraType.longValue() == 14 ){
|
|
|
|
- scene.setSceneSource(4);
|
|
|
|
- scene.setSceneScheme(10);
|
|
|
|
- }
|
|
|
|
|
|
|
|
if(pic!=null&&pic.length()>5)
|
|
if(pic!=null&&pic.length()>5)
|
|
{
|
|
{
|
|
@@ -973,6 +934,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
scenePlusVO.setId(scene.getId());
|
|
scenePlusVO.setId(scene.getId());
|
|
scenePlusVO.setNum(scene.getNum());
|
|
scenePlusVO.setNum(scene.getNum());
|
|
scenePlusVO.setWebSite(scene.getWebSite());
|
|
scenePlusVO.setWebSite(scene.getWebSite());
|
|
|
|
+ scenePlusVO.setDataSource(scene.getDataSource());
|
|
return scenePlusVO;
|
|
return scenePlusVO;
|
|
}
|
|
}
|
|
|
|
|