init
This commit is contained in:
@@ -4,7 +4,8 @@ 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.UserInfo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
|
||||
|
||||
/**
|
||||
* 用户信息Service接口
|
||||
@@ -17,5 +18,7 @@ public interface UserInfoService extends IService<UserInfo> {
|
||||
|
||||
UserInfo getByUserId(Long userId);
|
||||
|
||||
Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo);
|
||||
Page<UserInfoListAdminVo> pageAdmin(PageQuery pageQuery, UserInfoListAdminVo bo);
|
||||
|
||||
UserInfoDetailAdminVo fullUserInfo(Long id);
|
||||
}
|
||||
|
||||
@@ -4,13 +4,20 @@ 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.User;
|
||||
import com.ruoyi.xq.domain.UserInfo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo;
|
||||
import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
|
||||
import com.ruoyi.xq.mapper.UserInfoMapper;
|
||||
import com.ruoyi.xq.service.UserInfoService;
|
||||
import com.ruoyi.xq.service.UserService;
|
||||
import com.ruoyi.xq.util.AgeUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户信息Service业务层处理
|
||||
*
|
||||
@@ -21,6 +28,9 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> implements UserInfoService {
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
@Override
|
||||
public UserInfo getByUsercode(String usercode) {
|
||||
return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUsercode, usercode));
|
||||
@@ -32,7 +42,23 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> im
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo) {
|
||||
return baseMapper.pageAdmin(pageQuery.build(), bo);
|
||||
public Page<UserInfoListAdminVo> pageAdmin(PageQuery pageQuery, UserInfoListAdminVo bo) {
|
||||
Page<UserInfoListAdminVo> page = baseMapper.pageAdmin(pageQuery.build(), bo);
|
||||
List<UserInfoListAdminVo> records = page.getRecords();
|
||||
for (UserInfoListAdminVo record : records) {
|
||||
record.setAge(AgeUtil.getAge(record.getBirthday()));
|
||||
}
|
||||
return page;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserInfoDetailAdminVo fullUserInfo(Long userId) {
|
||||
UserInfoDetailAdminVo vo = new UserInfoDetailAdminVo();
|
||||
User user = userService.getById(userId);
|
||||
UserInfo userInfo = this.getByUserId(userId);
|
||||
user.setAge(AgeUtil.getAge(user.getBirthday()));
|
||||
vo.setUser(user);
|
||||
vo.setUserInfo(userInfo);
|
||||
return vo;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user