|
@@ -98,6 +98,10 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
private String copyCachesImages;
|
|
private String copyCachesImages;
|
|
@Value("${upgrade.houseType:yes}")
|
|
@Value("${upgrade.houseType:yes}")
|
|
private String createHouseType;
|
|
private String createHouseType;
|
|
|
|
+ @Value("${model.modelKind:3dtiles}")
|
|
|
|
+ private String modelKind;
|
|
|
|
+ @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
|
|
|
|
+ private List<Integer> sdTilesSceneSourceList;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private RedisLockUtil redisLockUtil;
|
|
private RedisLockUtil redisLockUtil;
|
|
@@ -408,6 +412,10 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
scenePlusExt.setVideos(videosJson.toJSONString());
|
|
scenePlusExt.setVideos(videosJson.toJSONString());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ //v3版本的模型是dam类型,pc端点击生成obj时,统一生成3dtiles模型且会调用升级接口
|
|
|
|
+ this.setLaserModelKind(scenePlus, scenePlusExt);
|
|
|
|
+
|
|
scenePlusExtService.updateById(scenePlusExt);
|
|
scenePlusExtService.updateById(scenePlusExt);
|
|
|
|
|
|
if(StrUtil.isNotEmpty(sceneEditInfo.getBoxVideos())){
|
|
if(StrUtil.isNotEmpty(sceneEditInfo.getBoxVideos())){
|
|
@@ -518,6 +526,22 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
+ * v3版本的模型是dam类型,pc端点击生成obj时,统一生成3dtiles模型且会调用升级接口
|
|
|
|
+ */
|
|
|
|
+ private void setLaserModelKind(ScenePlus scenePlus, ScenePlusExt scenePlusExt){
|
|
|
|
+ if(SceneSource.JG.code() != scenePlus.getSceneSource()){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if(StrUtil.isEmpty(modelKind) || !ModelKind.THREE_D_TILE.code().equals(modelKind) ||){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if(CollUtil.isEmpty(sdTilesSceneSourceList) || !sdTilesSceneSourceList.contains(scenePlus.getSceneSource())){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ scenePlusExt.setModelKind(ModelKind.THREE_D_TILE.message());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
* <p>
|
|
* <p>
|
|
场景升级后,场景id发生了变化,需要把新的id放入倒文件夹中
|
|
场景升级后,场景id发生了变化,需要把新的id放入倒文件夹中
|
|
* </p>
|
|
* </p>
|