Merge branch 'feature-v4.2.0-20220712' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1719,6 +1719,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public ResultData addMosaics(BaseDataParamVO param) throws Exception {
 
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
+
         //如果redis数据丢失，从本地文件中同步马赛克数据到redis
         this.syncMosaicFromFileToRedis(param.getNum());
 
@@ -1741,6 +1747,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //更新数据库
         this.updateMosaicFlag(param.getNum());
 
+        //更新版本号
+        this.upgradeVersionById(sceneEditInfo.getId());
+
         return ResultData.ok();
     }
 
@@ -2568,6 +2577,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public ResultData deleteMosaics(DeleteMosaicParamVO param) throws Exception {
 
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
+
         //如果redis数据丢失，从本地文件中同步马赛克数据到redis
         this.syncMosaicFromFileToRedis(param.getNum());
 
@@ -2580,6 +2595,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //更新数据库
         this.updateMosaicFlag(param.getNum());
 
+        //更新版本号
+        this.upgradeVersionById(sceneEditInfo.getId());
+
         return ResultData.ok();
     }