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

热点 删除图标时增加删除oss图标文件逻辑

4dkankan-center-scene/src/main/java/com/fdkankan/scene/schedule/ScheduleJob.java

@@ -1,16 +1,12 @@
 package com.fdkankan.scene.schedule;
 
-import com.fdkankan.common.util.RubberSheetingUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.scene.service.IScene3dNumService;
 import com.fdkankan.scene.service.ISceneService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Slf4j
@@ -31,8 +27,6 @@ public class ScheduleJob {
     @Autowired
     private RedisLockUtil redisLockUtil;
     @Autowired
-    RubberSheetingUtil rubberSheetingUtil;
-    @Autowired
     RabbitMqProducer rabbitMqProducer;
 
 //    /**

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

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

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

@@ -20,6 +20,7 @@ import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.FileBizType;
 import com.fdkankan.common.constant.OperationType;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.RecStatus;
@@ -75,7 +76,9 @@ import com.fdkankan.scene.service.ISceneProEditService;
 import com.fdkankan.scene.service.ISceneProExtService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneService;
+import com.fdkankan.scene.service.ISceneUploadService;
 import com.fdkankan.scene.vo.BaseDataParamVO;
+import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.DeleteHotIconParamVO;
 import com.fdkankan.scene.vo.DeleteHotParamVO;
 import com.fdkankan.scene.vo.FileNameAndDataParamVO;
@@ -198,6 +201,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IFdkkLaserService fdkkLaserService;
     @Resource
     ISceneProMapper sceneProMapper;
+    @Autowired
+    ISceneUploadService sceneUploadService;
 
     @Override
     public List<SceneVO> convert(List<ScenePro> list){
@@ -2395,6 +2400,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //写入本地文件，作为备份
         this.writeHotJson(param.getNum());
 
+        //删除oss文件
+        sceneUploadService.delete(
+            DeleteFileParamVO.builder()
+                .num(param.getNum())
+                .fileNames(fileNameList)
+                .bizType(FileBizType.TAG_ICON.code()).build());
 
         return ResultData.ok();
     }

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 = "sidList不能为空")
-    private List<String> sidList;
+    @NotNull(message = "fileNameList不能为空")
+    private List<String> fileNameList;