Procházet zdrojové kódy

场景计算后处理逻辑优化

dengsixing před 2 roky
rodič
revize
74550dfdb5

+ 6 - 0
src/main/java/com/fdkankan/contro/entity/ScenePlusExt.java

@@ -119,6 +119,12 @@ public class ScenePlusExt implements Serializable {
     private String sceneFrom;
 
     /**
+     * 切图方式(tiles:瓦片图,face:切片图,pan:全景图 ,local:本地切片,cube:立体图)
+     */
+    @TableField("scene_kind")
+    private String sceneKind;
+
+    /**
      * 计算耗时
      */
     @TableField("compute_time")

+ 11 - 4
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -433,6 +433,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                                 SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, boolean arrearCap)  throws Exception{
         String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
 
+        //清除redis缓存
+        redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
+
         String sceneJsonKey = dataViewPath + "scene.json";
         boolean exist = fYunFileService.fileExist(sceneJsonKey);
         //如果云端没有scene.json文件,生成一份
@@ -728,22 +731,26 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         SceneSource sceneSource = SceneSource.get(scenePlus.getSceneSource());
         switch (sceneSource){
             case BM:
-                scenePlusExt.setSceneResolution(SceneResolution.TILES_2K.code());
+                scenePlusExt.setSceneResolution(SceneResolution.two_K.code());
                 scenePlusExt.setSceneFrom(SceneFrom.PRO.code());
                 break;
             case SM:
-                scenePlusExt.setSceneResolution(SceneResolution.TILES_1K.code());
+                scenePlusExt.setSceneResolution(SceneResolution.one_k.code());
                 scenePlusExt.setSceneFrom(SceneFrom.LITE.code());
                 break;
             case ZT:
-                scenePlusExt.setSceneResolution(SceneResolution.TILES_4K.code());
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
                 scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
                 break;
             case JG:
-                scenePlusExt.setSceneResolution(SceneResolution.TILES_4K.code());
+                scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
                 scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
                 break;
         }
+
+        String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
+        scenePlusExt.setSceneKind(sceneKind);
+
         scenePlusExtService.updateById(scenePlusExt);