|
@@ -493,7 +493,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
String key = String.format(RedisKey.SCENE_HOT_DATA, num);
|
|
|
List<String> updateList = redisUtil.hMultiGet(key, new ArrayList<>(linkSids));
|
|
|
try {
|
|
|
- this.deleteHotMediaFile(num, updateList);
|
|
|
+ this.deleteHotMediaFile(num, updateList, false);
|
|
|
}catch (Exception e){
|
|
|
log.error("删除多媒体文件失败", e);
|
|
|
}
|
|
@@ -521,11 +521,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
redisUtil.hdel(key, deleteSidList.toArray());
|
|
|
|
|
|
//删除图片音频视频等资源文件
|
|
|
- this.deleteHotMediaFile(num, deletDataList);
|
|
|
+ this.deleteHotMediaFile(num, deletDataList, true);
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void deleteHotMediaFile(String num, List<String> hotdataList) throws Exception {
|
|
|
+ private void deleteHotMediaFile(String num, List<String> hotdataList, boolean deleteBgm) throws Exception {
|
|
|
if(CollUtil.isEmpty(hotdataList)){
|
|
|
return;
|
|
|
}
|
|
@@ -537,13 +537,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}
|
|
|
JSONObject jsonObject = JSON.parseObject(data);
|
|
|
|
|
|
- //删除北京音乐
|
|
|
- JSONObject bgm = jsonObject.getJSONObject("bgm");
|
|
|
- if(Objects.nonNull(bgm) && StrUtil.isNotEmpty(bgm.getString("src"))){
|
|
|
- String bgmSrc = bgm.getString("src");
|
|
|
- deleteFileList.add(bgmSrc);
|
|
|
+ //删除背景音乐
|
|
|
+ if(deleteBgm){
|
|
|
+ JSONObject bgm = jsonObject.getJSONObject("bgm");
|
|
|
+ if(Objects.nonNull(bgm) && StrUtil.isNotEmpty(bgm.getString("src"))){
|
|
|
+ String bgmSrc = bgm.getString("src");
|
|
|
+ deleteFileList.add(bgmSrc);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
String type = jsonObject.getString("type");
|
|
|
|
|
|
if("media".equals(type)){//V4.13.0版本改成这种方式
|