|
@@ -1212,21 +1212,22 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
|
|
|
this.upgradeVersionById(sceneEditInfo.getId());
|
|
|
|
|
|
-
|
|
|
-// SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
|
|
|
-// if(sceneEditInfo == null){
|
|
|
-// sceneEditInfo = new SceneEditInfo();
|
|
|
-// sceneEditInfo.setSceneProId(scenePro.getId());
|
|
|
-// sceneEditInfo.setBuildVideoStatus(CommonStatus.YES.code());
|
|
|
-// this.save(sceneEditInfo);
|
|
|
-// }else{
|
|
|
-// sceneEditInfo.setBuildVideoStatus(CommonStatus.YES.code());
|
|
|
-// this.updateById(sceneEditInfo);
|
|
|
-// }
|
|
|
+ //更新scene.json版本号
|
|
|
+ this.upgradeVersionToSceneJson(num);
|
|
|
|
|
|
return ResultData.ok();
|
|
|
}
|
|
|
|
|
|
+ private void upgradeVersionToSceneJson(String num) throws Exception{
|
|
|
+ String key = String.format(RedisKey.SCENE_JSON, num);
|
|
|
+ String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
|
|
|
+ String objectContent = uploadToOssUtil.getObjectContent(bucket, objectName);
|
|
|
+ SceneJsonBean sceneJsonBean = JSON.parseObject(objectContent, SceneJsonBean.class);
|
|
|
+ sceneJsonBean.setVersion(sceneJsonBean.getVersion() +1);
|
|
|
+ uploadToOssUtil.upload(JSON.toJSONString(sceneJsonBean).getBytes(), objectName);
|
|
|
+ redisUtil.set(key, JSON.toJSONString(sceneJsonBean));
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ResultData sceneSync(String num, String type, String floorPlanJson, String ajkJson, String cameraJson,
|
|
|
MultipartFile[] files) throws Exception {
|