This commit is contained in:
77
2024-03-17 17:14:36 +08:00
parent daa95dd756
commit 34fe7c08e8
17 changed files with 184 additions and 50 deletions

View File

@@ -1,7 +1,11 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserInfoAudit;
import com.ruoyi.xq.dto.admin.useraudit.UserInfoAuditAdminVo;
import com.ruoyi.xq.dto.app.common.IdsReq;
import com.ruoyi.xq.enums.user.UserInfoAuditTypeEnum;
/**
@@ -11,5 +15,17 @@ import com.ruoyi.xq.enums.user.UserInfoAuditTypeEnum;
* @date 2024-03-04
*/
public interface UserInfoAuditService extends IService<UserInfoAudit> {
UserInfoAudit getByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum);
/**
* 查询审核中的数据
* @param userId
* @param auditTypeEnum
* @return
*/
UserInfoAudit getAuditingDataByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum);
Page<UserInfoAuditAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAuditAdminVo bo);
void auditSuccess(String ids);
void auditFail(Long id, String auditRemark);
}

View File

@@ -1,15 +1,30 @@
package com.ruoyi.xq.service.impl;
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.common.core.domain.PageQuery;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserInfoAudit;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.useraudit.UserInfoAuditAdminVo;
import com.ruoyi.xq.dto.app.common.IdsReq;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.enums.user.UserInfoAuditTypeEnum;
import com.ruoyi.xq.enums.userinfo.UserHousingStatusEnum;
import com.ruoyi.xq.mapper.UserInfoAuditMapper;
import com.ruoyi.xq.service.UserInfoAuditService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* 用户信息审核Service业务层处理
*
@@ -20,8 +35,11 @@ import org.springframework.stereotype.Service;
@Service
public class UserInfoAuditServiceImpl extends ServiceImpl<UserInfoAuditMapper,UserInfoAudit> implements UserInfoAuditService {
@Autowired
private UserService userService;
@Override
public UserInfoAudit getByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum){
public UserInfoAudit getAuditingDataByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum){
return this.getOne(Wrappers.lambdaQuery(UserInfoAudit.class)
.eq(UserInfoAudit::getInfoType, auditTypeEnum.getCode())
.eq(UserInfoAudit::getUserId, userId)
@@ -29,4 +47,51 @@ public class UserInfoAuditServiceImpl extends ServiceImpl<UserInfoAuditMapper,Us
.last("limit 1"));
}
@Override
public Page<UserInfoAuditAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAuditAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
@Override
public void auditSuccess(String ids) {
String[] idArray = ids.split(",");
for (String id : idArray) {
boolean flag = this.update(Wrappers.lambdaUpdate(UserInfoAudit.class)
.eq(UserInfoAudit::getId, id)
.eq(UserInfoAudit::getAuditStatus, AuditEnum.AUDITING.getCode())
.set(UserInfoAudit::getAuditStatus, AuditEnum.SUCCESS.getCode())
.set(UserInfoAudit::getAuditIp, ServletUtils.getClientIP())
.set(UserInfoAudit::getAuditOpId, LoginHelper.getUserId())
.set(UserInfoAudit::getAuditOpName, LoginHelper.getUsername())
.set(UserInfoAudit::getAuditTime, LocalDateTime.now())
.set(UserInfoAudit::getAuditRemark, "审核成功"));
if(flag){
UserInfoAudit userInfoAudit = this.getById(id);
if(userInfoAudit.getInfoType().equals(UserInfoAuditTypeEnum.AVATAR.getCode())){
userService.update(Wrappers.lambdaUpdate(User.class)
.eq(User::getId, userInfoAudit.getUserId())
.set(User::getAvatar, userInfoAudit.getAuditContent()));
}else if(userInfoAudit.getInfoType().equals(UserInfoAuditTypeEnum.REMARK.getCode())){
userService.update(Wrappers.lambdaUpdate(User.class)
.eq(User::getId, userInfoAudit.getUserId())
.set(User::getRemark, userInfoAudit.getAuditContent()));
}
}
}
}
@Override
public void auditFail(Long id, String auditRemark) {
this.update(Wrappers.lambdaUpdate(UserInfoAudit.class)
.eq(UserInfoAudit::getId, id)
.eq(UserInfoAudit::getAuditStatus, AuditEnum.AUDITING.getCode())
.set(UserInfoAudit::getAuditStatus, AuditEnum.FAIL.getCode())
.set(UserInfoAudit::getAuditIp, ServletUtils.getClientIP())
.set(UserInfoAudit::getAuditOpId, LoginHelper.getUserId())
.set(UserInfoAudit::getAuditOpName, LoginHelper.getUsername())
.set(UserInfoAudit::getAuditTime, LocalDateTime.now())
.set(UserInfoAudit::getAuditRemark, auditRemark));
}
}

View File

@@ -28,7 +28,8 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
@Override
public List<UserPictures> listByUserId(Long userId) {
return this.list(Wrappers.lambdaQuery(UserPictures.class)
.eq(UserPictures::getUserId, userId));
.eq(UserPictures::getUserId, userId)
.in(UserPictures::getAuditStatus, AuditEnum.AUDITING.getCode(), AuditEnum.SUCCESS.getCode()));
}
@Override