1231123

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java

@@ -1,8 +1,6 @@
 package com.ruoyi.web.controller.cai.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserAlbum;
 import com.ruoyi.cai.dto.admin.query.BatchAuditReq;
@@ -14,8 +12,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -23,8 +19,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Collections;
 
 /**
  * 主播集锦
@@ -77,7 +73,7 @@ public class UserAlbumController extends BaseController {
     @PutMapping("/audit/fail")
     public R<Void> auditFail(@RequestBody UserAlbum bo) {
 //        userAlbumService.auditFail(bo.getId());
-        userAlbumService.removeAlbum(bo.getId());
+        userAlbumService.removeAlbum(Collections.singletonList(bo.getId()));
         return R.ok();
     }
 
@@ -101,6 +97,7 @@ public class UserAlbumController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(userAlbumService.removeBatchByIds(Arrays.asList(ids)));
+        userAlbumService.removeAlbum(Arrays.asList(ids));
+        return R.ok();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java

@@ -32,6 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 @RestController
@@ -133,7 +135,8 @@ public class UserAppController {
     @Operation(summary = "删除相册")
     @Log(title = "删除相册", businessType = BusinessType.OTHER, isSaveDb = true)
     public R<Boolean> userAlbumDel(@RequestBody IdReq res){
-        return R.ok(userAlbumService.removeAlbum(res.getId()));
+        userAlbumService.removeAlbum(Collections.singletonList(res.getId()));
+        return R.ok(true);
     }
 
     @PostMapping("/album/add")

ruoyi-cai/src/main/java/com/ruoyi/cai/executor/ExecutorConstant.java

@@ -22,8 +22,18 @@ public class ExecutorConstant {
     public static Executor COMMON_EXECUTOR;
     public static Executor SMS_EXECUTOR;
     public static Executor ROOM_EXECUTOR;
+    public static Executor FILE_EXECUTOR;
 
     static {
+        ThreadPoolExecutor fileExecutor = new ThreadPoolExecutor(CPU_NUM,
+                CPU_NUM << 2,
+                5,
+                TimeUnit.SECONDS,
+                new ArrayBlockingQueue<>(50),
+                init("fileExecutor-%d"),
+                new ThreadPoolExecutor.CallerRunsPolicy());
+        FILE_EXECUTOR = TtlExecutors.getTtlExecutor(fileExecutor);
+
         ThreadPoolExecutor smsExecutor = new ThreadPoolExecutor(CPU_NUM,
                 CPU_NUM << 2,
                 5,

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/FileManager.java

@@ -0,0 +1,32 @@
+package com.ruoyi.cai.manager;
+
+import com.ruoyi.cai.executor.ExecutorConstant;
+import com.ruoyi.oss.core.OssClient;
+import com.ruoyi.oss.factory.OssFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+@Component
+@Slf4j
+public class FileManager {
+
+    public void removeFile(String path){
+        removeFile(Collections.singletonList(path));
+    }
+
+    public void removeFile(List<String> pathList){
+        ExecutorConstant.FILE_EXECUTOR.execute(() -> {
+            OssClient storage = OssFactory.instance();
+            for (String path : pathList) {
+                try {
+                    storage.delete(path);
+                }catch (Exception e){
+                    log.error("删除文件失败！path={}",path, e);
+                }
+            }
+        });
+    }
+}

ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java

@@ -28,7 +28,7 @@ public interface UserAlbumService extends IService<UserAlbum> {
 
     boolean updateAlbum(AlbumUpdateReq res);
 
-    boolean removeAlbum(Long id);
+    void removeAlbum(List<Long> ids);
 
     boolean resetAlbum(List<AlbumResetReq> res, Long userId);
 

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicImagesServiceImpl.java

@@ -2,11 +2,17 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cai.domain.Dynamic;
 import com.ruoyi.cai.domain.DynamicImages;
+import com.ruoyi.cai.manager.FileManager;
 import com.ruoyi.cai.mapper.DynamicImagesMapper;
 import com.ruoyi.cai.service.DynamicImagesService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 附件Service业务层处理
  *
@@ -15,9 +21,14 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DynamicImagesServiceImpl extends ServiceImpl<DynamicImagesMapper, DynamicImages> implements DynamicImagesService {
+    @Autowired
+    private FileManager fileManager;
     @Override
     public void removeByDynamicId(Long dynamicId) {
+        List<DynamicImages> list = this.list(Wrappers.lambdaQuery(DynamicImages.class).eq(DynamicImages::getDynamicId, dynamicId));
+        List<String> urls = list.stream().map(DynamicImages::getUrl).collect(Collectors.toList());
         this.remove(Wrappers.lambdaQuery(DynamicImages.class)
                 .eq(DynamicImages::getDynamicId,dynamicId));
+        fileManager.removeFile(urls);
     }
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +13,7 @@ import com.ruoyi.cai.dto.app.query.album.AlbumResetReq;
 import com.ruoyi.cai.dto.app.query.album.AlbumUpdateReq;
 import com.ruoyi.cai.enums.AuditStatusEnum;
 import com.ruoyi.cai.enums.SystemConfigEnum;
+import com.ruoyi.cai.manager.FileManager;
 import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.mapper.UserAlbumMapper;
 import com.ruoyi.cai.service.UserAlbumService;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,6 +42,8 @@ public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum
     private UserService userService;
     @Autowired
     private SystemConfigManager systemConfigManager;
+    @Autowired
+    private FileManager fileManager;
     @Override
     public List<String> getUserAlbumSuccess(Long userId, Integer anchor){
         LambdaQueryWrapper<UserAlbum> eq = Wrappers.lambdaQuery(UserAlbum.class)
@@ -90,8 +94,14 @@ public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum
 
 
     @Override
-    public boolean removeAlbum(Long id){
+    public void removeAlbum(List<Long> ids){
-        return this.removeById(id);
+        if(CollectionUtils.isEmpty(ids)){
+            return;
+        }
+        List<UserAlbum> userAlbums = this.listByIds(ids);
+        List<String> urls = userAlbums.stream().map(UserAlbum::getUrl).collect(Collectors.toList());
+        this.removeBatchByIds(ids);
+        fileManager.removeFile(urls);
     }
 
     @Override

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruoyi.cai.dto.app.query.GiveGiftReq;
 import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo;
 import com.ruoyi.cai.dto.commom.consumer.GiftConsumerResp;
 import com.ruoyi.cai.enums.ConsumeLogType;
+import com.ruoyi.cai.enums.GenderEnum;
 import com.ruoyi.cai.manager.IdManager;
 import com.ruoyi.cai.manager.LockManager;
 import com.ruoyi.cai.mapper.UserGiftMapper;
@@ -69,6 +70,10 @@ public class UserGiftServiceImpl extends ServiceImpl<UserGiftMapper, UserGift> i
         if(anchor == null){
             throw new ServiceException("只能给主播送礼物哦");
         }
+        User fromUser = userService.getById(fromUserId);
+        if(!GenderEnum.MAN.getCode().equals(fromUser.getGender())){
+            throw new ServiceException("非男用户不能给主播送礼物哦");
+        }
         String guardLock = LockManager.getSendGuardLock(fromUserId);
         RLock lock = redissonClient.getLock(guardLock);
         if(lock.isLocked()){
@@ -78,7 +83,6 @@ public class UserGiftServiceImpl extends ServiceImpl<UserGiftMapper, UserGift> i
         resp.setGift(gift);
         try {
             lock.lock(3, TimeUnit.SECONDS);
-            User fromUser = userService.getById(fromUserId);
             Long price = gift.getPrice();
             Long traceId = IdManager.nextId();
             Long giftAmount = query.getGiftCount() * price;