场景升级，删除scenejson缓存

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

@@ -131,6 +131,11 @@ public class SceneJsonBean {
     private String sceneFrom;
 
     /**
+     * 切图方式（tiles：瓦片图，face：切片图，pan：全景图 ，local：本地切片，cube：立体图）
+     */
+    private String sceneKind;
+
+    /**
      * 视频覆盖数据
      */
     private String boxVideos;
@@ -166,4 +171,6 @@ public class SceneJsonBean {
     private Float floorPlanCompass;
 
 
+
+
 }

src/main/java/com/fdkankan/repair/controller/SceneRepairController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.SceneKind;
 import com.fdkankan.common.constant.SceneResolution;
@@ -21,11 +22,13 @@ import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.repair.bean.SceneRepairParamVO;
 import com.fdkankan.repair.bean.SceneUpgradeProgressBean;
+import com.fdkankan.repair.entity.SceneEditInfo;
 import com.fdkankan.repair.entity.ScenePlus;
 import com.fdkankan.repair.entity.ScenePlusExt;
 import com.fdkankan.repair.entity.ScenePro;
 import com.fdkankan.repair.entity.SceneProExt;
 import com.fdkankan.repair.httpclient.FdkankanMiniClient;
+import com.fdkankan.repair.service.ISceneEditInfoService;
 import com.fdkankan.repair.service.IScenePlusExtService;
 import com.fdkankan.repair.service.IScenePlusService;
 import com.fdkankan.repair.service.ISceneProExtService;
@@ -91,6 +94,8 @@ public class SceneRepairController {
     private IScenePlusService scenePlusService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
 
     /**
      * 最大线程数
@@ -280,15 +285,23 @@ public class SceneRepairController {
             }
             scenePlusExtService.updateById(scenePlusExt);
 
+            //更新版本号
+            SceneEditInfo sceneEditInfo = sceneEditInfoService.getOne(new LambdaQueryWrapper<SceneEditInfo>().eq(SceneEditInfo::getScenePlusId, scenePlus.getId()));
+            sceneEditInfo.setVersion(sceneEditInfo.getVersion() + 1);
+            sceneEditInfoService.updateById(sceneEditInfo);
+
             //修复scene.json
             String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json";
             String sceneJsonStr = uploadToOssUtil.getObjectContent(this.bucket, sceneJsonPath);
             JSONObject sceneJsonObject = JSON.parseObject(sceneJsonStr);
             sceneJsonObject.put("sceneResolution", scenePlusExt.getSceneResolution());
             sceneJsonObject.put("sceneKind", scenePlusExt.getSceneKind());
+            sceneJsonObject.put("version", sceneEditInfo.getVersion());
             uploadToOssUtil.upload(sceneJsonObject.toJSONString().getBytes(StandardCharsets.UTF_8), sceneJsonPath);
 
             //清除scene.json缓存
+            redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
+
         }
 
         return ResultData.ok();

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

@@ -379,6 +379,9 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 uploadToOssUtil.copyFiles(imagePath + "logo-main.png", editUsersPath + "loadingLogo-user.png");
                 uploadToOssUtil.copyFiles(imagePath + "logo-main.png", viewUsersPath + "loadingLogo-user.png");
             }
+            ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
+                new LambdaQueryWrapper<ScenePlusExt>()
+                    .eq(ScenePlusExt::getPlusId, scenePro.getId()));
             if(StrUtil.isNotEmpty(scenePro.getThumb())
                 && scenePro.getThumb().contains(imagePath)){
                 String thumbUrl = null;
@@ -399,9 +402,6 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 scenePro.setWebSite(webSite);
                 sceneProService.updateById(scenePro);
 
-                ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
-                    new LambdaQueryWrapper<ScenePlusExt>()
-                        .eq(ScenePlusExt::getPlusId, scenePro.getId()));
                 scenePlusExt.setThumb(thumbUrl);
                 scenePlusExt.setWebSite(webSite);
                 scenePlusExtService.updateById(scenePlusExt);
@@ -439,6 +439,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             sceneJson.setCreateTime(scenePro.getCreateTime());
             sceneJson.setSceneResolution(sceneProExt.getSceneResolution());
             sceneJson.setSceneFrom(sceneProExt.getSceneFrom());
+            sceneJson.setSceneKind(scenePlusExt.getSceneKind());
             if(StrUtil.isNotEmpty(scenePro.getVideos())){
                 sceneJson.setVideos(JSON.parseObject(scenePro.getVideos()));
             }
@@ -447,6 +448,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
             uploadToOssUtil.upload(JSON.toJSONBytes(sceneJson), sceneJsonPath);
 
+            redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
+
             //迁移耗时
             consumTime = Calendar.getInstance().getTimeInMillis() - startTime;
 

src/main/resources/bootstrap-dev-eur.yml

@@ -4,11 +4,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.0.47:8848
+        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-dev-eur
         extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
+          - data-id: 4dkankan-data-repair.yaml
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
@@ -32,8 +32,11 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
+        server-addr: 120.24.144.164:8848
+        namespace: 4dkankan-dev-eur
+
+
+