Browse Source

场景关联 删除图标时增加删除oss图标文件逻辑
热点 删除图标时增加删除oss图标文件逻辑

dengsixing 3 years ago
parent
commit
73784f8f97

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

@@ -1869,24 +1869,26 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if (scenePlus == null)
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        List<String> fileNameList = param.getFileNameList();
-        List<String> sidList = fileNameList.stream()
-            .map(fileName -> fileName.substring(0, fileName.lastIndexOf(".")))
-            .collect(Collectors.toList());
+        List<String> sidList = param.getSidList();
 
         this.syncLinkPanStylesFromFileToRedis(param.getNum());
 
         String key = String.format(RedisKey.SCENE_LINKPAN_STYLES, param.getNum());
+        List<String> deleteList = redisUtil.hMultiGet(key, sidList);
         redisUtil.hdel(key, sidList.toArray());
 
         //写入本地文件,作为备份
         this.writeLinkScene(param.getNum());
 
         //删除oss文件
+        List<String> deleteFileList = deleteList.stream().map(str -> {
+            JSONObject parse = JSON.parseObject(str);
+            return parse.getString("url");
+        }).collect(Collectors.toList());
         sceneUploadService.delete(
             DeleteFileParamVO.builder()
                 .num(param.getNum())
-                .fileNames(fileNameList)
+                .fileNames(deleteFileList)
                 .bizType(FileBizType.LINK_STYLE.code()).build());
 
         return ResultData.ok();

+ 2 - 2
4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/DeleteLinkSceneStylesParamVO.java

@@ -19,8 +19,8 @@ public class DeleteLinkSceneStylesParamVO {
     @NotBlank(message = "场景码不能为空")
     private String num;
 
-    @NotNull(message = "fileNameList不能为空")
-    private List<String> fileNameList;
+    @NotNull(message = "sidList不能为空")
+    private List<String> sidList;