From 0baa0cfb7abf9d459a236d2a10a8cc3a6e60ebb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Thu, 1 Feb 2024 19:06:22 +0800 Subject: [PATCH] 123 --- .../cai/admin/UserAlbumController.java | 22 +++++---- .../UserPictureAuditController.java | 28 ++++++++---- .../vo/user/UserPictureAuditAdminVo.java | 35 +++++++++++++++ .../cai/dto/app/vo/user/UserAlbumDTO.java | 2 +- .../cai/dto/app/vo/user/UserAvatarMinVo.java | 2 +- .../ruoyi/cai/manager/CurrentUserManager.java | 7 ++- .../cai/mapper/UserPictureAuditMapper.java | 4 ++ .../ruoyi/cai/service/UserAlbumService.java | 4 ++ .../cai/service/UserPictureAuditService.java | 9 ++++ .../service/impl/UserAlbumServiceImpl.java | 20 +++++++++ .../impl/UserPictureAuditServiceImpl.java | 45 ++++++++++++++++++- .../mapper/cai/UserPictureAuditMapper.xml | 28 +++++++----- 12 files changed, 174 insertions(+), 32 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/user/UserPictureAuditAdminVo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java index 32325ec0..e5d59bba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java @@ -62,15 +62,21 @@ public class UserAlbumController extends BaseController { } @SaCheckPermission("cai:userAlbum:edit") - @Log(title = "主播集锦", businessType = BusinessType.UPDATE) + @Log(title = "主播相册通过", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping("/audit") - public R audit(@RequestBody UserAlbum bo) { - LambdaUpdateWrapper update = Wrappers.lambdaUpdate(UserAlbum.class) - .eq(UserAlbum::getId, bo.getId()) - .set(UserAlbum::getAuditStatus, bo.getAuditStatus()) - .set(UserAlbum::getAuditTime, LocalDateTime.now()); - userAlbumService.update(update); + @PutMapping("/audit/success") + public R auditSuccess(@RequestBody UserAlbum bo) { + userAlbumService.auditSuccess(bo.getId()); + return R.ok(); + } + + @SaCheckPermission("cai:userAlbum:edit") + @Log(title = "主播相册不通过", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/audit/fail") + public R auditFail(@RequestBody UserAlbum bo) { +// userAlbumService.auditFail(bo.getId()); + userAlbumService.removeAlbum(bo.getId()); return R.ok(); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java index 0c93b86a..eac80f11 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java @@ -3,7 +3,9 @@ package com.ruoyi.cai.controller; import cn.dev33.satoken.annotation.SaCheckPermission; 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.domain.UserPictureAudit; +import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; import com.ruoyi.cai.service.UserPictureAuditService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -40,8 +42,8 @@ public class UserPictureAuditController extends BaseController { */ @SaCheckPermission("cai:userPictureAudit:list") @GetMapping("/list") - public TableDataInfo list(UserPictureAudit bo, PageQuery pageQuery) { - Page page = userPictureAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserPictureAuditAdminVo bo, PageQuery pageQuery) { + Page page = userPictureAuditService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -57,17 +59,25 @@ public class UserPictureAuditController extends BaseController { return R.ok(userPictureAuditService.getById(id)); } - /** - * 修改头像审核 - */ @SaCheckPermission("cai:userPictureAudit:edit") - @Log(title = "头像审核", businessType = BusinessType.UPDATE) + @Log(title = "头像审核通过", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserPictureAudit bo) { - return toAjax(userPictureAuditService.updateById(bo)); + @PutMapping("/audit/success") + public R auditSuccess(@RequestBody UserPictureAudit bo) { + userPictureAuditService.auditSuccess(bo.getId()); + return R.ok(); } + @SaCheckPermission("cai:userPictureAudit:edit") + @Log(title = "头像审核不通过", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/audit/fail") + public R auditFail(@RequestBody UserPictureAudit bo) { + userPictureAuditService.auditFail(bo.getId()); + return R.ok(); + } + + /** * 删除头像审核 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/user/UserPictureAuditAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/user/UserPictureAuditAdminVo.java new file mode 100644 index 00000000..c2c44b53 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/user/UserPictureAuditAdminVo.java @@ -0,0 +1,35 @@ +package com.ruoyi.cai.dto.admin.vo.user; + +import com.ruoyi.cai.domain.UserPictureAudit; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; +import lombok.Data; + +@Data +public class UserPictureAuditAdminVo extends UserPictureAudit { + /** + * 用户号/ID号 + */ + private String usercode; + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + @Sensitive(strategy = SensitiveStrategy.PHONE) + private String mobile; + + /** + * 头像 + */ + private String avatar; + /** + * 性别 + */ + private Integer gender; + private Integer age; + private Integer isAnchor; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java index 57677a2b..5ea605a7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java @@ -26,7 +26,7 @@ public class UserAlbumDTO { /** * 状态 0 未审核 1 审核通过 2 审核未通过 */ - @Schema(description = "状态 0-未审核 1-审核通过 2-审核未通过") + @Schema(description = "状态 1-审核中 2-审核通过 3-审核失败") private Integer auditStatus; /** * 审核时间 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAvatarMinVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAvatarMinVo.java index 1a2f8960..bcccd48b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAvatarMinVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAvatarMinVo.java @@ -7,6 +7,6 @@ import lombok.Data; public class UserAvatarMinVo { @Schema(description = "头像") private String avatar; - @Schema(description = "状态 0-未审核 1-审核通过 2-审核未通过") + @Schema(description = "状态 1-审核中 2-审核通过 3-审核失败") private Integer auditStatus; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index d0122045..2e7e5c33 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -26,7 +26,6 @@ import com.ruoyi.yunxin.client.ImUserRefClient; import com.ruoyi.yunxin.req.UpdateUinfoReq; import com.ruoyi.yunxin.resp.YxCommonR; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -77,6 +76,7 @@ public class CurrentUserManager { Long userId = LoginHelper.getUserId(); User user = userService.getById(userId); CurrentUserUpdateInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserUpdateInfoVo::new); + res.setUserId(user.getId()); UserPictureAudit audit = userPictureAuditService.getOneUserAuditRunningPic(UserPictureAuditType.AVATAR.getCode(), res.getUserId()); CurrentUserUpdateInfoVo.Avatar avatar = new CurrentUserUpdateInfoVo.Avatar(); if(audit == null){ @@ -260,6 +260,11 @@ public class CurrentUserManager { save.setAuditStatus(AuditStatusEnum.AUDITING.getCode()); userPictureAuditService.save(save); vo.setAuditStatus(AuditStatusEnum.AUDITING.getCode()); + } else { + userService.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId, res.getUserId()) + .set(User::getAvatar, res.getAvatar()) + .set(User::getAvatarState, 1)); } vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode()); return vo; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java index f2f817ee..634c1f9b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.UserPictureAudit; +import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; +import org.apache.ibatis.annotations.Param; /** * 头像审核Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.UserPictureAudit; */ public interface UserPictureAuditMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") UserPictureAuditAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java index 9c446185..e9e06b24 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java @@ -33,4 +33,8 @@ public interface UserAlbumService extends IService { boolean resetAlbum(List res, Long userId); Page pageAdmin(PageQuery pageQuery, UserAlbumAdminVo bo); + + void auditSuccess(Long id); + + void auditFail(Long id); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java index 511f2ef0..48b8bf10 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java @@ -1,7 +1,10 @@ package com.ruoyi.cai.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.UserPictureAudit; +import com.ruoyi.cai.dto.admin.vo.user.UserPictureAuditAdminVo; +import com.ruoyi.common.core.domain.PageQuery; /** * 头像审核Service接口 @@ -11,4 +14,10 @@ import com.ruoyi.cai.domain.UserPictureAudit; */ public interface UserPictureAuditService extends IService { UserPictureAudit getOneUserAuditRunningPic(Integer type, Long userId); + + Page pageAdmin(PageQuery pageQuery, UserPictureAuditAdminVo bo); + + void auditSuccess(Long id); + + void auditFail(Long id); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java index 3d15913d..e0fc3484 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java @@ -1,6 +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.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,6 +22,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -107,4 +109,22 @@ public class UserAlbumServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, UserPictureAuditAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(),bo); + } + + @Autowired + private UserService userService; + + @Override + @Transactional(rollbackFor = Exception.class) + public void auditSuccess(Long id) { + UserPictureAudit userPictureAudit = this.getById(id); + boolean update = this.update(Wrappers.lambdaUpdate(UserPictureAudit.class) + .eq(UserPictureAudit::getId, id) + .eq(UserPictureAudit::getAuditStatus, AuditStatusEnum.AUDITING.getCode()) + .set(UserPictureAudit::getAuditStatus, AuditStatusEnum.SUCCESS.getCode()) + .set(UserPictureAudit::getAuditTime, LocalDateTime.now())); + if(update){ + userService.update(Wrappers.lambdaUpdate(User.class) + .eq(User::getId, userPictureAudit.getUserId()) + .set(User::getAvatar, userPictureAudit.getUrl()) + .set(User::getAvatarState, 1)); + } + } + + @Override + public void auditFail(Long id) { + this.update(Wrappers.lambdaUpdate(UserPictureAudit.class) + .eq(UserPictureAudit::getId, id) + .eq(UserPictureAudit::getAuditStatus, AuditStatusEnum.AUDITING.getCode()) + .set(UserPictureAudit::getAuditStatus, AuditStatusEnum.FAIL.getCode()) + .set(UserPictureAudit::getAuditTime, LocalDateTime.now())); + } } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml index 7808fad7..0a7ba377 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml @@ -4,17 +4,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - +