1111

src/main/java/com/fdkankan/jp/xspace/service/impl/SceneXspaceServiceImpl.java

@@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.RecStatus;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.jp.xspace.common.PageInfo;
 import com.fdkankan.jp.xspace.common.Result;
 import com.fdkankan.jp.xspace.common.ResultCode;
+import com.fdkankan.jp.xspace.common.constant.OSSPathConstant;
 import com.fdkankan.jp.xspace.common.rabbitmq.RabbitmqConstant;
 import com.fdkankan.jp.xspace.common.rabbitmq.dto.SceneXspaceMqDTO;
 import com.fdkankan.jp.xspace.dto.XspacePageDTO;
@@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -54,6 +57,8 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
     private IScenePlusService scenePlusService;
     @Autowired
     private RabbitMqProducer mqProducer;
+    @Resource
+    private FYunFileServiceInterface fYunFileService;
 
     @Override
     public PageInfo pageXspace(XspacePageDTO param, User user) {
@@ -96,12 +101,13 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
         }
 
         sceneXspaces.stream().forEach(x->{
-            // TODO: 2024/7/24 删除oss文件
-
             x.setUpdater(user.getId());
             x.setRecStatus(RecStatus.DISABLE.code());
             this.updateById(x);
             this.removeById(x.getId());
+
+            String xspaceSceneKey = String.format(OSSPathConstant.XSPACE_SCENE_FORMAT, x.getNum(), x.getSerial());
+            fYunFileService.deleteFolder(xspaceSceneKey);
         });
 
         return Result.success();