Merge branch 'feature-3dtiles-20221202-dsx' into release

src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -146,6 +146,8 @@ public class SceneJsonBean {
      */
     private String sceneKind;
 
+    private String modelKind;
+
     /**
      * 视频覆盖数据
      */

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -125,6 +125,13 @@ public class ScenePlusExt implements Serializable {
     private String sceneKind;
 
     /**
+     * 算法模型类型（dam,3dtiles）
+     */
+    @TableField("model_kind")
+    private String modelKind;
+
+
+    /**
      * 点位视频
      */
     @TableField("videos")

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -54,6 +54,7 @@ public class RabbitMqListener {
         }
         int sceneProId = (int)hashMap.get("sceneProId");
         boolean reUpgrade = (boolean)hashMap.get("reUpgrade");
+        String modelkind = (String) hashMap.get("modelKind");
         //迁移数据
         sceneUpgradeToV4Service.upgrade(sceneProId,reUpgrade);
         log.info("场景升级结束，队列名：{}，id：{}", upgradeToV4, messageId);

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -10,7 +10,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.FolderScene;
 import com.fdkankan.scene.entity.ScenePlus;
@@ -467,6 +469,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             sceneJson.setSceneResolution(scenePlusExt.getSceneResolution());
             sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
             sceneJson.setSceneKind(scenePlusExt.getSceneKind());
+            sceneJson.setModelKind(scenePlusExt.getModelKind());
             if(StrUtil.isNotEmpty(scenePro.getVideos())){
                 sceneJson.setVideos(JSON.parseObject(scenePlusExt.getVideos()));
             }