|
@@ -9,7 +9,9 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.fdkankan.common.constant.CommonStatus;
|
|
|
+import com.fdkankan.common.constant.ModelKind;
|
|
|
import com.fdkankan.common.constant.RecStatus;
|
|
|
+import com.fdkankan.common.constant.SceneSource;
|
|
|
import com.fdkankan.model.utils.CreateHouseJsonUtil;
|
|
|
import com.fdkankan.scene.entity.ScenePlus;
|
|
|
import com.fdkankan.scene.service.IScenePlusService;
|
|
@@ -115,7 +117,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
private IScenePlusService scenePlusService;
|
|
|
|
|
|
@Override
|
|
|
- public void upgrade(long sceneProId, boolean reUpgrade, String modelKind) throws Exception{
|
|
|
+ public void upgrade(long sceneProId, boolean reUpgrade) throws Exception{
|
|
|
|
|
|
ScenePro scenePro = sceneProService.getById(sceneProId);
|
|
|
ScenePlus scenePlus = scenePlusService.getByNum(scenePro.getNum());
|
|
@@ -387,7 +389,9 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
|
|
|
scenePlusExt.setThumb(thumbUrl);
|
|
|
scenePlusExt.setWebSite(webSite);
|
|
|
- scenePlusExt.setModelKind(StrUtil.isNotBlank(modelKind) ? modelKind : "dam");
|
|
|
+ //3dtiles算法上线后激光生成obj调用升级,一定是3dtiles类型,其他v3场景升级还是原来的dam
|
|
|
+ String modelKind = scenePlus.getSceneSource() == SceneSource.JG.code().intValue() ? ModelKind.THREE_D_TILE.code() : ModelKind.DAM.code();
|
|
|
+ scenePlusExt.setModelKind(modelKind);
|
|
|
scenePlusExtService.updateById(scenePlusExt);
|
|
|
|
|
|
if(StrUtil.isNotEmpty(sceneEditInfo.getBoxVideos())){
|