This commit is contained in:
77
2024-03-18 00:07:03 +08:00
parent bd4ad464a5
commit 688ef1d649
25 changed files with 465 additions and 21 deletions

View File

@@ -16,7 +16,9 @@ import java.util.List;
*/
public interface UserPicturesService extends IService<UserPictures> {
List<UserPictures> listByUserId(Long userId);
List<UserPictures> listByUserIdAuditingAndSuccess(Long userId);
List<UserPictures> listByUserIdSuccess(Long userId);
Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo);

View File

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.app.user.HomePageReq;
import com.ruoyi.xq.dto.app.user.vo.HomeUserListVo;
import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
/**
@@ -31,4 +33,8 @@ public interface UserService extends IService<User> {
void resetNickname(Long userId);
Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo bo);
Page<HomeUserListVo> homePage(HomePageReq params);
}

View File

@@ -0,0 +1,23 @@
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.UserStar;
import com.ruoyi.xq.dto.app.user.vo.HomeUserListVo;
import com.ruoyi.xq.dto.app.userstar.UserStarQuery;
import com.ruoyi.xq.dto.app.userstar.UserStarReq;
import com.ruoyi.xq.dto.app.userstar.vo.UserStarListVo;
/**
* 用户关注Service接口
*
* @author 77
* @date 2024-03-17
*/
public interface UserStarService extends IService<UserStar> {
void starUpdate(UserStarReq req);
Page<UserStarListVo> pageApp(PageQuery pageQuery, UserStarQuery query);
}

View File

@@ -26,7 +26,14 @@ import java.util.List;
public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,UserPictures> implements UserPicturesService {
@Override
public List<UserPictures> listByUserId(Long userId) {
public List<UserPictures> listByUserIdAuditingAndSuccess(Long userId) {
return this.list(Wrappers.lambdaQuery(UserPictures.class)
.eq(UserPictures::getUserId, userId)
.in(UserPictures::getAuditStatus, AuditEnum.AUDITING.getCode(), AuditEnum.SUCCESS.getCode()));
}
@Override
public List<UserPictures> listByUserIdSuccess(Long userId) {
return this.list(Wrappers.lambdaQuery(UserPictures.class)
.eq(UserPictures::getUserId, userId)
.in(UserPictures::getAuditStatus, AuditEnum.AUDITING.getCode(), AuditEnum.SUCCESS.getCode()));

View File

@@ -12,15 +12,20 @@ import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.domain.UserPictures;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.app.user.HomePageReq;
import com.ruoyi.xq.dto.app.user.vo.HomeUserListVo;
import com.ruoyi.xq.dto.app.user.vo.HomeUserVo;
import com.ruoyi.xq.enums.common.SystemConfigEnum;
import com.ruoyi.xq.enums.userinfo.UserGenderEnum;
import com.ruoyi.xq.manager.SystemConfigManager;
import com.ruoyi.xq.mapper.UserMapper;
import com.ruoyi.xq.service.UserInfoService;
import com.ruoyi.xq.service.UserPicturesService;
import com.ruoyi.xq.service.UserService;
import com.ruoyi.xq.util.BirthdayUtil;
import com.ruoyi.yunxin.client.ImUserRefClient;
import com.ruoyi.yunxin.req.UpdateUinfoReq;
import com.ruoyi.yunxin.resp.YxCommonR;
@@ -28,7 +33,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;
/**
* 用户管理Service业务层处理
@@ -41,10 +49,12 @@ import org.springframework.transaction.annotation.Transactional;
public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements UserService {
@Autowired
private UserInfoService userInfoService;
@Autowired
@Resource
private ImUserRefClient userRefClient;
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private UserPicturesService userPicturesService;
@Override
public User getByUsername(String username) {
@@ -75,6 +85,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
HomeUserVo result = new HomeUserVo();
BeanConvertUtil.copyProperties(userInfo,result);
BeanConvertUtil.copyProperties(user,result);
List<UserPictures> userPicturesList = userPicturesService.listByUserIdSuccess(userId);
result.setUserPictureList(userPicturesList.stream().map(UserPictures::getPicture).collect(Collectors.toList()));
return result;
}
@@ -150,4 +162,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
@Override
public Page<HomeUserListVo> homePage(HomePageReq params) {
Page<HomeUserListVo> page = baseMapper.homePageApp(params.build(), params);
List<HomeUserListVo> records = page.getRecords();
for (HomeUserListVo record : records) {
record.setBirthdayStr(BirthdayUtil.getMinBirthday(record.getBirthday()));
}
return page;
}
}

View File

@@ -0,0 +1,74 @@
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.exception.ServiceException;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserStar;
import com.ruoyi.xq.dto.app.userstar.UserStarQuery;
import com.ruoyi.xq.dto.app.userstar.UserStarReq;
import com.ruoyi.xq.dto.app.userstar.vo.UserStarListVo;
import com.ruoyi.xq.mapper.UserStarMapper;
import com.ruoyi.xq.service.UserService;
import com.ruoyi.xq.service.UserStarService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 用户关注Service业务层处理
*
* @author 77
* @date 2024-03-17
*/
@Service
public class UserStarServiceImpl extends ServiceImpl<UserStarMapper,UserStar> implements UserStarService {
@Autowired
private UserService userService;
/**
*
* @Schema(description = "1-关注 2-取消关注")
*/
@Override
public void starUpdate(UserStarReq req) {
User user = userService.getById(req.getUserId());
User starUser = userService.getById(req.getStarUserId());
if(user == null || starUser == null){
return;
}
Integer star = req.getStar();
if(star == null){
throw new ServiceException("参数异常");
}
if(req.getStar().equals(1)){ // 关注
this.remove(Wrappers.lambdaQuery(UserStar.class)
.eq(UserStar::getUserId, req.getUserId())
.eq(UserStar::getStarUserId, req.getStarUserId()));
UserStar userStar = new UserStar();
userStar.setUserId(user.getId());
userStar.setUsercode(user.getUsercode());
userStar.setStarUserId(starUser.getId());
userStar.setStarUserCode(starUser.getUsercode());
this.save(userStar);
}else if(req.getStar().equals(2)){
this.remove(Wrappers.lambdaQuery(UserStar.class)
.eq(UserStar::getUserId, req.getUserId())
.eq(UserStar::getStarUserId, req.getStarUserId()));
}
}
@Override
public Page<UserStarListVo> pageApp(PageQuery pageQuery, UserStarQuery query) {
if(query.getQueryType() == null){
throw new ServiceException("参数异常");
}
if(query.getQueryType() == 1){
return baseMapper.selectMyStar(pageQuery.build(),query);
}else if(query.getQueryType() == 2){
return baseMapper.selectStarMe(pageQuery.build(),query);
}else{
throw new ServiceException("参数异常");
}
}
}