|
@@ -1165,7 +1165,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
cameraType = 14L;
|
|
|
}
|
|
|
BuildSceneCallMessage message = null;
|
|
|
- if(sceneSource == SceneSource.JG.code() || sceneSource == SceneSource.SG.code()){
|
|
|
+ if(cameraType == 14){
|
|
|
String userName = null;
|
|
|
Long sceneUserId = scenePlus.getUserId();
|
|
|
if (!ObjectUtils.isEmpty(sceneUserId)) {
|
|
@@ -1175,14 +1175,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
Camera cameraEntity = cameraService.getById(scenePlus.getCameraId());
|
|
|
fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true);
|
|
|
message = this.getBuildSceneMqMessage(
|
|
|
- num, cameraType,
|
|
|
- fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
|
|
|
+ num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
|
|
|
fdageData, buildType, path);
|
|
|
}else{
|
|
|
message = this.getBuildSceneMqMessage(
|
|
|
num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
|
|
|
- fdageData, buildType,
|
|
|
- path);
|
|
|
+ fdageData, buildType, path);
|
|
|
}
|
|
|
if(deleteExtras){
|
|
|
message.getExt().put("deleteExtras",deleteExtras);
|
|
@@ -1334,7 +1332,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
cameraType = 13L;
|
|
|
}
|
|
|
|
|
|
- if (detailEntity.getType() == 10) {
|
|
|
+ if (CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(detailEntity.getType())) {
|
|
|
cameraType = 14L;
|
|
|
}
|
|
|
String sceneNum = scene3dNumService.generateSceneNum(detailEntity.getType());
|