Merge branch 'feature-v4.12.0-dsx' into test

src/main/java/com/fdkankan/openApi/service/www/impl/SceneDynamicPanelServiceImpl.java

@@ -18,6 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.openApi.service.www.ISceneEditInfoService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.www.SceneDynamicPanelParamVO;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +49,8 @@ public class SceneDynamicPanelServiceImpl extends ServiceImpl<ISceneDynamicPanel
     private FYunFileServiceInterface fileServiceInterface;
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private RedisUtil redisUtil;
 
 
     @Override
@@ -102,7 +106,23 @@ public class SceneDynamicPanelServiceImpl extends ServiceImpl<ISceneDynamicPanel
         fileServiceInterface.uploadFile(JSON.toJSONString(values).getBytes(StandardCharsets.UTF_8), editPath);
         fileServiceInterface.uploadFile(JSON.toJSONString(values).getBytes(StandardCharsets.UTF_8), viewPath);
 
-        //更新版本号
+        //更新数据库版本号
         sceneEditInfoService.upSceneVersion(scenePlus.getId());
+
+        //更新缓存版本号
+        String key = String.format(RedisKey.SCENE_JSON, param.getNum());
+        String sceneJsonStr = redisUtil.get(key);
+        JSONObject scenejsonObj = JSON.parseObject(sceneJsonStr);
+        scenejsonObj.replace("version", scenejsonObj.getIntValue("version") + 1);
+        redisUtil.set(key, JSON.toJSONString(scenejsonObj));
+
+        //更新scene.json版本号
+        String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH, param.getNum()) + "scene.json";
+        sceneJsonStr = fileServiceInterface.getFileContent(sceneJsonPath);
+        scenejsonObj = JSON.parseObject(sceneJsonStr);
+        scenejsonObj.replace("version", scenejsonObj.getIntValue("version") + 1);
+        fileServiceInterface.uploadFile(JSON.toJSONBytes(scenejsonObj), sceneJsonPath);
+
+
     }
 }