shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
张良(004796)
2024-03-05 18:57:21 +08:00
parent 779de6cbc1
commit 7e1f31ed2f
65 changed files with 1976 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicImageService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.DynamicImage;
/**
* 动态图片Service接口
*
* @author 77
* @date 2024-03-04
*/
public interface DynamicImageService extends IService<DynamicImage> {
}

8
ruoyi-xq/src/main/java/com/ruoyi/xq/service/DynamicService.java
View File

@@ -1,7 +1,12 @@
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.Dynamic;
import com.ruoyi.xq.dto.app.dynamic.AddDynamicReq;
import com.ruoyi.xq.dto.app.dynamic.DynamicListVo;
import com.ruoyi.xq.dto.app.dynamic.DynamicQuery;
/**
* 动态审核Service接口
@@ -11,4 +16,7 @@ import com.ruoyi.xq.domain.Dynamic;
*/
public interface DynamicService extends IService<Dynamic> {
void push(AddDynamicReq req);
Page<DynamicListVo> pageApp(PageQuery pageQuery, DynamicQuery dynamicQuery);
}

49
ruoyi-xq/src/main/java/com/ruoyi/xq/service/IDynamicImageService.java
View File

@@ -1,49 +0,0 @@
package com.ruoyi.xq.service;
import com.ruoyi.xq.domain.DynamicImage;
import com.ruoyi.xq.domain.vo.DynamicImageVo;
import com.ruoyi.xq.domain.bo.DynamicImageBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 动态图片Service接口
*
* @author 77
* @date 2024-03-04
*/
public interface IDynamicImageService {
/**
* 查询动态图片
*/
DynamicImageVo queryById(Long id);
/**
* 查询动态图片列表
*/
TableDataInfo<DynamicImageVo> queryPageList(DynamicImageBo bo, PageQuery pageQuery);
/**
* 查询动态图片列表
*/
List<DynamicImageVo> queryList(DynamicImageBo bo);
/**
* 新增动态图片
*/
Boolean insertByBo(DynamicImageBo bo);
/**
* 修改动态图片
*/
Boolean updateByBo(DynamicImageBo bo);
/**
* 校验并批量删除动态图片信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

49
ruoyi-xq/src/main/java/com/ruoyi/xq/service/IUserExtendService.java
View File

@@ -1,49 +0,0 @@
package com.ruoyi.xq.service;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.domain.vo.UserExtendVo;
import com.ruoyi.xq.domain.bo.UserExtendBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 用户邀请Service接口
*
* @author 77
* @date 2024-03-04
*/
public interface IUserExtendService {
/**
* 查询用户邀请
*/
UserExtendVo queryById(Long id);
/**
* 查询用户邀请列表
*/
TableDataInfo<UserExtendVo> queryPageList(UserExtendBo bo, PageQuery pageQuery);
/**
* 查询用户邀请列表
*/
List<UserExtendVo> queryList(UserExtendBo bo);
/**
* 新增用户邀请
*/
Boolean insertByBo(UserExtendBo bo);
/**
* 修改用户邀请
*/
Boolean updateByBo(UserExtendBo bo);
/**
* 校验并批量删除用户邀请信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

6
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthAuditService.java
View File

@@ -1,7 +1,9 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserAuthAudit;
import com.ruoyi.xq.enums.user.UserAuthTypeEnum;
/**
* 用户认证审核Service接口
@@ -11,4 +13,8 @@ import com.ruoyi.xq.domain.UserAuthAudit;
*/
public interface UserAuthAuditService extends IService<UserAuthAudit> {
void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic, String remark);
default void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic) {
saveAuthAudit(user,userAuthType,pic, null);
}
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthService.java
View File

@@ -10,4 +10,5 @@ import com.ruoyi.xq.domain.UserAuth;
* @date 2024-03-04
*/
public interface UserAuthService extends IService<UserAuth> {
UserAuth getByUserId(Long userId);
}

14
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.UserExtend;
/**
* 用户邀请Service接口
*
* @author 77
* @date 2024-03-04
*/
public interface UserExtendService extends IService<UserExtend> {
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoAuditService.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.UserInfoAudit;
import com.ruoyi.xq.enums.user.UserInfoAuditTypeEnum;
/**
* 用户信息审核Service接口
@@ -10,4 +11,5 @@ import com.ruoyi.xq.domain.UserInfoAudit;
* @date 2024-03-04
*/
public interface UserInfoAuditService extends IService<UserInfoAudit> {
UserInfoAudit getByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum);
}

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java
View File

@@ -10,4 +10,7 @@ import com.ruoyi.xq.domain.UserInfo;
* @date 2024-03-04
*/
public interface UserInfoService extends IService<UserInfo> {
UserInfo getByUsercode(String usercode);
UserInfo getByUserId(Long userId);
}

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
View File

@@ -3,6 +3,8 @@ package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.UserPictures;
import java.util.List;
/**
* 用户相册管理Service接口
*
@@ -11,4 +13,5 @@ import com.ruoyi.xq.domain.UserPictures;
*/
public interface UserPicturesService extends IService<UserPictures> {
List<UserPictures> listByUserId(Long userId);
}

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
/**
* 用户管理Service接口
@@ -16,4 +17,6 @@ public interface UserService extends IService<User> {
void resetPassword(Long userId, String password);
User getByUsercode(String usercode);
HomeUserVo homeUser(Long userId);
}

102
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicImageServiceImpl.java
View File

@@ -1,23 +1,11 @@
package com.ruoyi.xq.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.xq.domain.bo.DynamicImageBo;
import com.ruoyi.xq.domain.vo.DynamicImageVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.DynamicImage;
import com.ruoyi.xq.mapper.DynamicImageMapper;
import com.ruoyi.xq.service.IDynamicImageService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import com.ruoyi.xq.service.DynamicImageService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 动态图片Service业务层处理
@@ -27,86 +15,6 @@ import java.util.Collection;
*/
@RequiredArgsConstructor
@Service
public class DynamicImageServiceImpl implements IDynamicImageService {
public class DynamicImageServiceImpl extends ServiceImpl<DynamicImageMapper,DynamicImage> implements DynamicImageService {
private final DynamicImageMapper baseMapper;
/**
* 查询动态图片
*/
@Override
public DynamicImageVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询动态图片列表
*/
@Override
public TableDataInfo<DynamicImageVo> queryPageList(DynamicImageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DynamicImage> lqw = buildQueryWrapper(bo);
Page<DynamicImageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询动态图片列表
*/
@Override
public List<DynamicImageVo> queryList(DynamicImageBo bo) {
LambdaQueryWrapper<DynamicImage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<DynamicImage> buildQueryWrapper(DynamicImageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DynamicImage> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, DynamicImage::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getUsercode()), DynamicImage::getUsercode, bo.getUsercode());
lqw.eq(bo.getDynamicId() != null, DynamicImage::getDynamicId, bo.getDynamicId());
lqw.eq(StringUtils.isNotBlank(bo.getUrl()), DynamicImage::getUrl, bo.getUrl());
return lqw;
}
/**
* 新增动态图片
*/
@Override
public Boolean insertByBo(DynamicImageBo bo) {
DynamicImage add = BeanUtil.toBean(bo, DynamicImage.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改动态图片
*/
@Override
public Boolean updateByBo(DynamicImageBo bo) {
DynamicImage update = BeanUtil.toBean(bo, DynamicImage.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DynamicImage entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除动态图片
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

66
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java
View File

@@ -1,11 +1,31 @@
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.xq.domain.Dynamic;
import com.ruoyi.xq.domain.DynamicImage;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.dto.app.dynamic.AddDynamicReq;
import com.ruoyi.xq.dto.app.dynamic.DynamicListVo;
import com.ruoyi.xq.dto.app.dynamic.DynamicQuery;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.mapper.DynamicMapper;
import com.ruoyi.xq.service.DynamicImageService;
import com.ruoyi.xq.service.DynamicService;
import com.ruoyi.xq.service.UserService;
import com.ruoyi.xq.util.AgeUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 动态审核Service业务层处理
@@ -17,4 +37,50 @@ import org.springframework.stereotype.Service;
@Service
public class DynamicServiceImpl extends ServiceImpl<DynamicMapper,Dynamic> implements DynamicService {
@Autowired
private UserService userService;
@Autowired
private DynamicImageService dynamicImageService;
@Override
@Transactional(rollbackFor = Exception.class)
public void push(AddDynamicReq req) {
User user = userService.getById(req.getUserId());
Dynamic dynamic = new Dynamic();
dynamic.setUserId(user.getId());
dynamic.setUsercode(user.getUsercode());
dynamic.setContent(req.getContent());
dynamic.setAuditStatus(AuditEnum.AUDITING.getCode());
this.save(dynamic);
List<String> imagesList = req.getImageList();
for (String image : imagesList) {
DynamicImage dynamicImage = new DynamicImage();
dynamicImage.setUserId(user.getId());
dynamicImage.setUsercode(user.getUsercode());
dynamicImage.setDynamicId(dynamic.getId());
dynamicImage.setUrl(image);
dynamicImageService.save(dynamicImage);
}
}
@Override
public Page<DynamicListVo> pageApp(PageQuery pageQuery, DynamicQuery dynamicQuery) {
Page<DynamicListVo> page = baseMapper.pageApp(pageQuery.build(), dynamicQuery);
List<DynamicListVo> records = page.getRecords();
if(CollectionUtils.isEmpty(records)){
return page;
}
List<Long> dynamicIds = records.stream().map(DynamicListVo::getId).collect(Collectors.toList());
List<DynamicImage> list = dynamicImageService.list(Wrappers.lambdaQuery(DynamicImage.class).in(DynamicImage::getDynamicId, dynamicIds));
Map<Long, List<DynamicImage>> map = list.stream().collect(Collectors.groupingBy(DynamicImage::getDynamicId));
for (DynamicListVo record : records) {
record.setAge(AgeUtil.getAge(record.getBirthday()));
List<DynamicImage> images = map.get(record.getId());
if(images == null){
images = new ArrayList<>();
}
record.setImageList(images.stream().map(DynamicImage::getUrl).collect(Collectors.toList()));
}
return page;
}
}

17
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserAuthAuditServiceImpl.java
View File

@@ -1,10 +1,16 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserAuthAudit;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.enums.user.UserAuthTypeEnum;
import com.ruoyi.xq.mapper.UserAuthAuditMapper;
import com.ruoyi.xq.service.UserAuthAuditService;
import com.ruoyi.xq.service.UserAuthService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +23,15 @@ import org.springframework.stereotype.Service;
@Service
public class UserAuthAuditServiceImpl extends ServiceImpl<UserAuthAuditMapper,UserAuthAudit> implements UserAuthAuditService {
@Override
public void saveAuthAudit(User user, UserAuthTypeEnum userAuthType, String pic, String remark) {
UserAuthAudit userAuthAudit = new UserAuthAudit();
userAuthAudit.setUserId(user.getId());
userAuthAudit.setUsercode(user.getUsercode());
userAuthAudit.setAuthType(userAuthType.getCode());
userAuthAudit.setAuthPic(pic);
userAuthAudit.setAuthRemark(remark);
userAuthAudit.setAuditStatus(AuditEnum.AUDITING.getCode());
this.save(userAuthAudit);
}
}

8
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserAuthServiceImpl.java
View File

@@ -1,10 +1,10 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserAuth;
import com.ruoyi.xq.mapper.UserAuthMapper;
import com.ruoyi.xq.service.UserAuthService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -13,8 +13,12 @@ import org.springframework.stereotype.Service;
* @author 77
* @date 2024-03-04
*/
@RequiredArgsConstructor
@Service
public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper,UserAuth> implements UserAuthService {
@Override
public UserAuth getByUserId(Long userId) {
return this.getOne(Wrappers.lambdaQuery(UserAuth.class)
.eq(UserAuth::getUserId, userId));
}
}

106
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java
View File

@@ -1,23 +1,11 @@
package com.ruoyi.xq.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.xq.domain.bo.UserExtendBo;
import com.ruoyi.xq.domain.vo.UserExtendVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.mapper.UserExtendMapper;
import com.ruoyi.xq.service.IUserExtendService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import com.ruoyi.xq.service.UserExtendService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 用户邀请Service业务层处理
@@ -27,90 +15,6 @@ import java.util.Collection;
*/
@RequiredArgsConstructor
@Service
public class UserExtendServiceImpl implements IUserExtendService {
public class UserExtendServiceImpl extends ServiceImpl<UserExtendMapper,UserExtend> implements UserExtendService {
private final UserExtendMapper baseMapper;
/**
* 查询用户邀请
*/
@Override
public UserExtendVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 查询用户邀请列表
*/
@Override
public TableDataInfo<UserExtendVo> queryPageList(UserExtendBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<UserExtend> lqw = buildQueryWrapper(bo);
Page<UserExtendVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询用户邀请列表
*/
@Override
public List<UserExtendVo> queryList(UserExtendBo bo) {
LambdaQueryWrapper<UserExtend> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<UserExtend> buildQueryWrapper(UserExtendBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<UserExtend> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, UserExtend::getUserId, bo.getUserId());
lqw.eq(StringUtils.isNotBlank(bo.getUsercode()), UserExtend::getUsercode, bo.getUsercode());
lqw.eq(bo.getIncomeCoin() != null, UserExtend::getIncomeCoin, bo.getIncomeCoin());
lqw.eq(bo.getInviteId() != null, UserExtend::getInviteId, bo.getInviteId());
lqw.eq(StringUtils.isNotBlank(bo.getInviteCode()), UserExtend::getInviteCode, bo.getInviteCode());
lqw.eq(bo.getConsumeTotal() != null, UserExtend::getConsumeTotal, bo.getConsumeTotal());
lqw.eq(bo.getWithdrawTotal() != null, UserExtend::getWithdrawTotal, bo.getWithdrawTotal());
lqw.eq(bo.getCashbackTotal() != null, UserExtend::getCashbackTotal, bo.getCashbackTotal());
return lqw;
}
/**
* 新增用户邀请
*/
@Override
public Boolean insertByBo(UserExtendBo bo) {
UserExtend add = BeanUtil.toBean(bo, UserExtend.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改用户邀请
*/
@Override
public Boolean updateByBo(UserExtendBo bo) {
UserExtend update = BeanUtil.toBean(bo, UserExtend.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(UserExtend entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除用户邀请
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

12
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoAuditServiceImpl.java
View File

@@ -1,7 +1,10 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserInfoAudit;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.enums.user.UserInfoAuditTypeEnum;
import com.ruoyi.xq.mapper.UserInfoAuditMapper;
import com.ruoyi.xq.service.UserInfoAuditService;
import lombok.RequiredArgsConstructor;
@@ -17,4 +20,13 @@ import org.springframework.stereotype.Service;
@Service
public class UserInfoAuditServiceImpl extends ServiceImpl<UserInfoAuditMapper,UserInfoAudit> implements UserInfoAuditService {
@Override
public UserInfoAudit getByUserIdAndType(Long userId, UserInfoAuditTypeEnum auditTypeEnum){
return this.getOne(Wrappers.lambdaQuery(UserInfoAudit.class)
.eq(UserInfoAudit::getInfoType, auditTypeEnum.getCode())
.eq(UserInfoAudit::getUserId, userId)
.eq(UserInfoAudit::getAuditStatus, AuditEnum.AUDITING.getCode())
.last("limit 1"));
}
}

10
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.mapper.UserInfoMapper;
@@ -17,4 +18,13 @@ import org.springframework.stereotype.Service;
@Service
public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> implements UserInfoService {
@Override
public UserInfo getByUsercode(String usercode) {
return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUsercode, usercode));
}
@Override
public UserInfo getByUserId(Long userId) {
return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserId, userId));
}
}

10
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
View File

@@ -1,20 +1,26 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.mapper.UserPicturesMapper;
import com.ruoyi.xq.service.UserPicturesService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 用户相册管理Service业务层处理
*
* @author 77
* @date 2024-03-04
*/
@RequiredArgsConstructor
@Service
public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,UserPictures> implements UserPicturesService {
@Override
public List<UserPictures> listByUserId(Long userId) {
return this.list(Wrappers.lambdaQuery(UserPictures.class)
.eq(UserPictures::getUserId, userId));
}
}

20
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -4,11 +4,15 @@ import cn.dev33.satoken.secure.BCrypt;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
import com.ruoyi.xq.mapper.UserMapper;
import com.ruoyi.xq.service.UserInfoService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -17,10 +21,10 @@ import org.springframework.stereotype.Service;
* @author 77
* @date 2024-03-04
*/
@RequiredArgsConstructor
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements UserService {
@Autowired
private UserInfoService userInfoService;
@Override
public User getByUsername(String username) {
return this.getOne(Wrappers.lambdaQuery(User.class)
@@ -42,4 +46,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
return this.getOne(Wrappers.lambdaQuery(User.class)
.eq(User::getUsercode,usercode).last("limit 1"));
}
@Override
public HomeUserVo homeUser(Long userId) {
User user = this.getById(userId);
UserInfo userInfo = userInfoService.getByUserId(userId);
HomeUserVo result = new HomeUserVo();
BeanConvertUtil.copyProperties(userInfo,result);
BeanConvertUtil.copyProperties(user,result);
return result;
}
}