|
@@ -263,8 +263,11 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
|
|
SceneProEdit sceneProEdit = sceneProEditService.getByProId(scenePro.getId());
|
|
SceneProEdit sceneProEdit = sceneProEditService.getByProId(scenePro.getId());
|
|
sceneProEdit.setVersion(ObjectUtils.isEmpty(sceneProEdit.getVersion()) ? 0 : sceneProEdit.getVersion() + 1);
|
|
sceneProEdit.setVersion(ObjectUtils.isEmpty(sceneProEdit.getVersion()) ? 0 : sceneProEdit.getVersion() + 1);
|
|
sceneProEdit.setImagesVersion(ObjectUtils.isEmpty(sceneProEdit.getImagesVersion()) ? 0 : sceneProEdit.getImagesVersion() + 1);
|
|
sceneProEdit.setImagesVersion(ObjectUtils.isEmpty(sceneProEdit.getImagesVersion()) ? 0 : sceneProEdit.getImagesVersion() + 1);
|
|
- sceneProEdit.setFloorEditVer(ObjectUtils.isEmpty(sceneProEdit.getFloorEditVer()) ? 0 : sceneProEdit.getFloorEditVer() + 1);
|
|
|
|
- sceneProEdit.setFloorPublishVer(ObjectUtils.isEmpty(sceneProEdit.getFloorPublishVer()) ? 0 : sceneProEdit.getFloorPublishVer() + 1);
|
|
|
|
|
|
+ int ver = Objects.isNull(sceneProEdit.getFloorPublishVer()) ? 0 : sceneProEdit.getFloorPublishVer() + 1;
|
|
|
|
+ int floorEditVer = Objects.isNull(sceneProEdit.getFloorEditVer()) ? 0 : sceneProEdit.getFloorEditVer() + 1;
|
|
|
|
+ ver = ver < floorEditVer ? floorEditVer : ver;
|
|
|
|
+ sceneProEdit.setFloorEditVer(ver);
|
|
|
|
+ sceneProEdit.setFloorPublishVer(ver);
|
|
if (cameraType == 14) {
|
|
if (cameraType == 14) {
|
|
//计算成功 激光转台相机 同步 请求
|
|
//计算成功 激光转台相机 同步 请求
|
|
fdkkLaserService.syncBuildResult(scenePro.getNum(), scenePro.getDataSource(),scenePro.getCreateTime());
|
|
fdkkLaserService.syncBuildResult(scenePro.getNum(), scenePro.getDataSource(),scenePro.getCreateTime());
|