123

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.cai.domain.UserAlbum;
 import com.ruoyi.cai.dto.admin.vo.UserAlbumAdminVo;
-import com.ruoyi.cai.dto.app.query.AlbumAddReq;
-import com.ruoyi.cai.dto.app.query.AlbumResetReq;
+import com.ruoyi.cai.dto.app.query.album.AlbumAddReq;
+import com.ruoyi.cai.dto.app.query.album.AlbumResetReq;
+import com.ruoyi.cai.dto.app.query.album.AlbumUpdateReq;
 import com.ruoyi.common.core.domain.PageQuery;
 
 import java.util.List;
@@ -19,13 +20,13 @@ import java.util.List;
 public interface UserAlbumService extends IService<UserAlbum> {
 
 
-    List<String> getUserAlbum(Long userId, Integer anchor);
+    List<String> getUserAlbumSuccess(Long userId, Integer anchor);
 
     List<UserAlbum> listByUserId(Long userId);
 
-    boolean addAlbum(AlbumAddReq res);
+    UserAlbum addAlbum(AlbumAddReq res);
 
-    boolean updateAlbum(AlbumAddReq res);
+    boolean updateAlbum(AlbumUpdateReq res);
 
     boolean removeAlbum(Long id);
 

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

@@ -10,4 +10,5 @@ import com.ruoyi.cai.domain.UserPictureAudit;
  * @date 2024-02-01
  */
 public interface UserPictureAuditService extends IService<UserPictureAudit> {
+    UserPictureAudit getOneUserAuditRunningPic(Integer type, Long userId);
 }

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

@@ -4,10 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserAlbum;
 import com.ruoyi.cai.dto.admin.vo.UserAlbumAdminVo;
-import com.ruoyi.cai.dto.app.query.AlbumAddReq;
-import com.ruoyi.cai.dto.app.query.AlbumResetReq;
+import com.ruoyi.cai.dto.app.query.album.AlbumAddReq;
+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.SystemConfigManager;
 import com.ruoyi.cai.mapper.UserAlbumMapper;
 import com.ruoyi.cai.service.UserAlbumService;
 import com.ruoyi.cai.service.UserService;
@@ -31,11 +36,13 @@ import java.util.stream.Collectors;
 public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum> implements UserAlbumService {
     @Autowired
     private UserService userService;
+    @Autowired
+    private SystemConfigManager systemConfigManager;
     @Override
-    public List<String> getUserAlbum(Long userId,Integer anchor){
+    public List<String> getUserAlbumSuccess(Long userId, Integer anchor){
         LambdaQueryWrapper<UserAlbum> eq = Wrappers.lambdaQuery(UserAlbum.class)
                 .select(UserAlbum::getUrl)
-                .eq(UserAlbum::getShowHome,true)
+                .eq(UserAlbum::getAuditStatus,AuditStatusEnum.SUCCESS.getCode())
                 .eq(UserAlbum::getUserId, userId);
         List<UserAlbum> list = this.list(eq);
         return list.stream().map(UserAlbum::getUrl).collect(Collectors.toList());
@@ -47,23 +54,31 @@ public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum
     }
 
     @Override
-    public boolean addAlbum(AlbumAddReq res) {
+    public UserAlbum addAlbum(AlbumAddReq res) {
+        User user = userService.getById(res.getUserId());
+        boolean ignoreAudit;
+        if(user.getIsAnchor() == 1){
+            ignoreAudit = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT);
+        }else{
+            ignoreAudit = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.NO_ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT);
+        }
         UserAlbum album = new UserAlbum();
         album.setUserId(res.getUserId());
         album.setUrl(res.getUrl());
         album.setOrderBy(res.getOrderBy());
-        album.setShowHome(true);
+        album.setAuditStatus(ignoreAudit ? AuditStatusEnum.SUCCESS.getCode():AuditStatusEnum.AUDITING.getCode());
+        album.setIgnoreAudit(ignoreAudit);
         this.save(album);
-        return true;
+        return album;
     }
 
     @Override
-    public boolean updateAlbum(AlbumAddReq res) {
+    @Deprecated
+    public boolean updateAlbum(AlbumUpdateReq res) {
         UserAlbum album = new UserAlbum();
         album.setId(res.getId());
         album.setUrl(res.getUrl());
         album.setOrderBy(res.getOrderBy());
-        album.setShowHome(true);
         this.updateById(album);
         return true;
     }

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

@@ -1,7 +1,9 @@
 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.UserPictureAudit;
+import com.ruoyi.cai.enums.AuditStatusEnum;
 import com.ruoyi.cai.mapper.UserPictureAuditMapper;
 import com.ruoyi.cai.service.UserPictureAuditService;
 import org.springframework.stereotype.Service;
@@ -15,4 +17,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserPictureAuditServiceImpl extends ServiceImpl<UserPictureAuditMapper,UserPictureAudit> implements UserPictureAuditService {
 
+    @Override
+    public UserPictureAudit getOneUserAuditRunningPic(Integer type, Long userId) {
+        return this.getOne(Wrappers.lambdaQuery(UserPictureAudit.class)
+                .eq(UserPictureAudit::getAuditStatus, AuditStatusEnum.AUDITING)
+                .eq(UserPictureAudit::getType,type)
+                .eq(UserPictureAudit::getUserId,userId)
+                .last("limit 1"));
+    }
 }

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

@@ -15,7 +15,6 @@ import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo;
 import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
 import com.ruoyi.cai.enums.GenderEnum;
-import com.ruoyi.cai.manager.CurrentUserManager;
 import com.ruoyi.cai.mapper.UserMapper;
 import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.*;
@@ -164,7 +163,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         vo.setCityId(user.getCityId());
         vo.setFansNum(userFollowService.getFansNumByUserId(userId));
         vo.setStar(userFollowService.checkStar(currentUserId, userId));
-        vo.setAlbumList(userAlbumService.getUserAlbum(userId, user.getIsAnchor()));
+        vo.setAlbumList(userAlbumService.getUserAlbumSuccess(userId, user.getIsAnchor()));
         // 在线状态
         OnlineStatusVo onlineStatusVo;
         if(user.getIsAnchor() == 1 && anchor != null){