From a9d0a51bc1520b23d8d25e0e1cb49eee47dc0a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Thu, 1 Feb 2024 17:05:39 +0800 Subject: [PATCH] 123 --- .../UserPictureAuditController.java | 83 +++++++++++++++++++ .../java/com/ruoyi/cai/domain/UserAlbum.java | 1 + .../ruoyi/cai/domain/UserPictureAudit.java | 61 ++++++++++++++ .../ruoyi/cai/manager/UserForbidManager.java | 16 ++-- .../cai/mapper/UserPictureAuditMapper.java | 14 ++++ .../cai/service/UserPictureAuditService.java | 13 +++ .../impl/UserPictureAuditServiceImpl.java | 18 ++++ .../mapper/cai/UserPictureAuditMapper.xml | 20 +++++ 8 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserPictureAudit.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java create mode 100644 ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml 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 new file mode 100644 index 00000000..0c93b86a --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UserPictureAuditController.java @@ -0,0 +1,83 @@ +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.UserPictureAudit; +import com.ruoyi.cai.service.UserPictureAuditService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +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.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +/** + * 头像审核 + * + * @author 77 + * @date 2024-02-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/userPictureAudit") +public class UserPictureAuditController extends BaseController { + + private final UserPictureAuditService userPictureAuditService; + + /** + * 查询头像审核列表 + */ + @SaCheckPermission("cai:userPictureAudit:list") + @GetMapping("/list") + public TableDataInfo list(UserPictureAudit bo, PageQuery pageQuery) { + Page page = userPictureAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + /** + * 获取头像审核详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:userPictureAudit:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(userPictureAuditService.getById(id)); + } + + /** + * 修改头像审核 + */ + @SaCheckPermission("cai:userPictureAudit:edit") + @Log(title = "头像审核", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody UserPictureAudit bo) { + return toAjax(userPictureAuditService.updateById(bo)); + } + + /** + * 删除头像审核 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:userPictureAudit:remove") + @Log(title = "头像审核", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(userPictureAuditService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java index d9f913ee..0243faa9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java @@ -34,6 +34,7 @@ public class UserAlbum implements Serializable { */ private String url; private Integer auditStatus; + private Integer ignoreAudit; /** * 审核时间 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserPictureAudit.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserPictureAudit.java new file mode 100644 index 00000000..95133a89 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserPictureAudit.java @@ -0,0 +1,61 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 头像审核对象 cai_user_picture_audit + * + * @author 77 + * @date 2024-02-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("cai_user_picture_audit") +public class UserPictureAudit extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + /** + * 图片审核类型 1-头像 + */ + private Integer type; + /** + * 用户ID + */ + private Long userId; + /** + * + */ + private String url; + /** + * 状态 0-未审核 1-审核通过 2-审核未通过 + */ + private Integer auditStatus; + /** + * 是否免审核 + */ + private Integer igoreAudit; + /** + * 审核时间 + */ + private Date auditTime; + /** + * 审核备注 + */ + private String auditRemark; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java index c74a8023..3de929b4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java @@ -49,6 +49,7 @@ public class UserForbidManager { public void batchForbid(UserForbidReq userForbidReq){ List type = userForbidReq.getType(); User user = userService.getById(userForbidReq.getUserId()); + UserInfo userInfo = userInfoService.getByUserId(userForbidReq.getUserId()); ForbidTimeEnum forbidTimeEnum = ForbidTimeEnum.getByCode(userForbidReq.getForbidTime()); if(forbidTimeEnum == null){ throw new ServiceException("封禁天数错误"); @@ -56,12 +57,12 @@ public class UserForbidManager { if(forbidTimeEnum == ForbidTimeEnum.UNFORBID){ UserForbidManager userForbidManager = SpringUtil.getBean(UserForbidManager.class); for (Integer integer : type) { - if(ForbidTypeEnum.USER.getCode().equals(integer)){ - userForbidManager.unForbidByTypeAndMember(integer,user.getUsercode(),userForbidReq.getReason()); - }else if(ForbidTypeEnum.IMEI.getCode().equals(integer)){ - userForbidManager.unForbidByTypeAndMember(integer,user.getUsercode(),userForbidReq.getReason()); - }else if(ForbidTypeEnum.IP.getCode().equals(integer)){ + if(ForbidTypeEnum.USER.getCode().equals(integer) && user != null){ userForbidManager.unForbidByTypeAndMember(integer,user.getUsercode(),userForbidReq.getReason()); + }else if(ForbidTypeEnum.IMEI.getCode().equals(integer) && userInfo != null && StringUtils.isNotBlank(userInfo.getImei())){ + userForbidManager.unForbidByTypeAndMember(integer,userInfo.getImei(),userForbidReq.getReason()); + }else if(ForbidTypeEnum.IP.getCode().equals(integer) && userInfo != null && StringUtils.isNotBlank(userInfo.getLastLoginIp())){ + userForbidManager.unForbidByTypeAndMember(integer,userInfo.getLastLoginIp(),userForbidReq.getReason()); } } return; @@ -75,7 +76,6 @@ public class UserForbidManager { dto.setRemark(userForbidReq.getReason()); this.forbid(dto); }else if(ForbidTypeEnum.IMEI.getCode().equals(integer)){ - UserInfo userInfo = userInfoService.getByUserId(user.getId()); if(userInfo != null && StringUtils.isNotEmpty(userInfo.getImei())){ UserForbidDTO dto = new UserForbidDTO(); dto.setForbidTime(userForbidReq.getForbidTime()); @@ -85,7 +85,6 @@ public class UserForbidManager { this.forbid(dto); } }else if(ForbidTypeEnum.IP.getCode().equals(integer)){ - UserInfo userInfo = userInfoService.getByUserId(user.getId()); if(userInfo != null && StringUtils.isNotEmpty(userInfo.getLastLoginIp())){ UserForbidDTO dto = new UserForbidDTO(); dto.setForbidTime(userForbidReq.getForbidTime()); @@ -183,6 +182,9 @@ public class UserForbidManager { .eq(UserForbid::getType,type) .eq(UserForbid::getMember,member) .last("limit 1")); + if(userForbid == null){ + return; + } if(ForbidStatusEnum.NORMAL.getCode().equals(userForbid.getForbidStatus()) || userForbid.getEndTime().isBefore(LocalDateTime.now())){ // 无封号 log.info("无封号，无需操作! type={},member={}", type,member); 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 new file mode 100644 index 00000000..f2f817ee --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserPictureAuditMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.UserPictureAudit; + +/** + * 头像审核Mapper接口 + * + * @author 77 + * @date 2024-02-01 + */ +public interface UserPictureAuditMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..95c9c1f0 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserPictureAuditService.java @@ -0,0 +1,13 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.UserPictureAudit; + +/** + * 头像审核Service接口 + * + * @author 77 + * @date 2024-02-01 + */ +public interface UserPictureAuditService extends IService { +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java new file mode 100644 index 00000000..332ef408 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserPictureAuditServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.UserPictureAudit; +import com.ruoyi.cai.mapper.UserPictureAuditMapper; +import com.ruoyi.cai.service.UserPictureAuditService; +import org.springframework.stereotype.Service; + +/** + * 头像审核Service业务层处理 + * + * @author 77 + * @date 2024-02-01 + */ +@Service +public class UserPictureAuditServiceImpl extends ServiceImpl implements UserPictureAuditService { + +} diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml new file mode 100644 index 00000000..7808fad7 --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserPictureAuditMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + +