This commit is contained in:
77
2024-04-19 00:40:49 +08:00
parent 92b78cf2d5
commit 115eebac8e
8 changed files with 97 additions and 2 deletions

View File

@@ -11,4 +11,5 @@ import com.ruoyi.xq.domain.UserLogin;
*/
public interface UserLoginService extends IService<UserLogin> {
UserLogin getByUserId(Long userId);
}

View File

@@ -4,6 +4,7 @@ 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.User;
import com.ruoyi.xq.dto.admin.user.FullUserVo;
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;
@@ -43,4 +44,9 @@ public interface UserService extends IService<User> {
List<HomeUserListVo> vipHomePage();
boolean lock(Long id);
boolean unlock(Long id);
FullUserVo fullUserAdmin(Long userId);
}

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.UserLogin;
import com.ruoyi.xq.mapper.UserLoginMapper;
@@ -17,4 +18,8 @@ import org.springframework.stereotype.Service;
@Service
public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper,UserLogin> implements UserLoginService {
@Override
public UserLogin getByUserId(Long userId) {
return this.getOne(Wrappers.lambdaQuery(UserLogin.class).eq(UserLogin::getUserId, userId).last("limit 1"));
}
}

View File

@@ -12,9 +12,9 @@ import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.*;
import com.ruoyi.xq.dto.admin.user.FullUserVo;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.app.auth.LoginUser;
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;
@@ -54,6 +54,8 @@ import java.util.stream.Collectors;
public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements UserService {
@Autowired
private UserInfoService userInfoService;
@Autowired
private UserLoginService userLoginService;
@Resource
private ImUserRefClient userRefClient;
@Autowired
@@ -264,4 +266,30 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
}
return null;
}
@Override
public boolean lock(Long id) {
return this.update(Wrappers.lambdaUpdate(User.class).eq(User::getId,id).set(User::getStatus, 1));
}
@Override
public boolean unlock(Long id) {
return this.update(Wrappers.lambdaUpdate(User.class).eq(User::getId,id).set(User::getStatus, 0));
}
@Override
public FullUserVo fullUserAdmin(Long userId) {
FullUserVo vo = new FullUserVo();
User user = this.getById(userId);
vo.setUser(user);
UserInfo userInfo = userInfoService.getByUserId(userId);
vo.setUserInfo(userInfo);
UserAuth userAuth = userAuthService.getByUserId(userId);
vo.setUserAuth(userAuth);
UserLogin userLogin = userLoginService.getByUserId(userId);
vo.setUserLogin(userLogin);
List<UserPictures> userPicturesList = userPicturesService.listByUserIdSuccess(userId);
vo.setUserPicturesList(userPicturesList);
return vo;
}
}