gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【sys】【user】更新查询用户列表接口

pull/55/MERGE
fengshuonan 2023-06-11 20:49:11 +08:00
parent 6b14d72c1a
commit 710e03f3f7
8 changed files with 31 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java
View File

@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 系统用户控制器
@ -76,17 +75,6 @@ public class SysUserController {
return new SuccessResponseData<>(sysUserService.detail(sysUserRequest));
}
/**
* 获取列表
*
* @author fengshuonan
* @date 2023/06/10 21:26
*/
@GetResource(name = "获取列表", path = "/sysUser/list")
public ResponseData<List<SysUser>> list(SysUserRequest sysUserRequest) {
return new SuccessResponseData<>(sysUserService.findList(sysUserRequest));
}
/**
* 获取列表（带分页）
*

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserDataScopeController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserDataScopeController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.user.controller;
package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.user.controller;
package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupDetailController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupDetailController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.user.controller;
package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserOrgController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserOrgController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.user.controller;
package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserRoleController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserRoleController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.user.controller;
package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;

8
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -134,6 +135,13 @@ public class SysUser extends BaseExpandFieldEntity {
@ChineseDescription("最后登陆时间")
private Date lastLoginTime;
/**
* 用户的排序
*/
@TableField("user_sort")
@ChineseDescription("用户的排序")
private BigDecimal userSort;
/**
* 对接外部主数据的用户id
*/

61
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser;
@ -27,7 +28,7 @@ import java.util.List;
@Service
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
@Override
@Override
public void add(SysUserRequest sysUserRequest) {
SysUser sysUser = new SysUser();
BeanUtil.copyProperties(sysUserRequest, sysUser);
@ -55,6 +56,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public PageResult<SysUser> findPage(SysUserRequest sysUserRequest) {
LambdaQueryWrapper<SysUser> wrapper = createWrapper(sysUserRequest);
// 只查询需要的字段
wrapper.select(SysUser::getUserId, SysUser::getRealName, SysUser::getAccount, SysUser::getSex, SysUser::getStatusFlag, BaseEntity::getCreateTime);
Page<SysUser> sysRolePage = this.page(PageFactory.defaultPage(), wrapper);
return PageResultFactory.createPageResult(sysRolePage);
}
@ -88,49 +93,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private LambdaQueryWrapper<SysUser> createWrapper(SysUserRequest sysUserRequest) {
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
Long userId = sysUserRequest.getUserId();
String realName = sysUserRequest.getRealName();
String nickName = sysUserRequest.getNickName();
String account = sysUserRequest.getAccount();
String password = sysUserRequest.getPassword();
Long avatar = sysUserRequest.getAvatar();
String birthday = sysUserRequest.getBirthday();
String sex = sysUserRequest.getSex();
String email = sysUserRequest.getEmail();
String phone = sysUserRequest.getPhone();
String tel = sysUserRequest.getTel();
String superAdminFlag = sysUserRequest.getSuperAdminFlag();
Integer statusFlag = sysUserRequest.getStatusFlag();
Integer loginCount = sysUserRequest.getLoginCount();
String lastLoginIp = sysUserRequest.getLastLoginIp();
String lastLoginTime = sysUserRequest.getLastLoginTime();
String masterUserId = sysUserRequest.getMasterUserId();
String expandField = sysUserRequest.getExpandField();
Long versionFlag = sysUserRequest.getVersionFlag();
String delFlag = sysUserRequest.getDelFlag();
Long tenantId = sysUserRequest.getTenantId();
// 根据输入内容进行查询
String searchText = sysUserRequest.getSearchText();
if (ObjectUtil.isNotEmpty(searchText)) {
queryWrapper.like(SysUser::getRealName, searchText);
queryWrapper.or().like(SysUser::getAccount, searchText);
}
queryWrapper.eq(ObjectUtil.isNotNull(userId), SysUser::getUserId, userId);
queryWrapper.like(ObjectUtil.isNotEmpty(realName), SysUser::getRealName, realName);
queryWrapper.like(ObjectUtil.isNotEmpty(nickName), SysUser::getNickName, nickName);
queryWrapper.like(ObjectUtil.isNotEmpty(account), SysUser::getAccount, account);
queryWrapper.like(ObjectUtil.isNotEmpty(password), SysUser::getPassword, password);
queryWrapper.eq(ObjectUtil.isNotNull(avatar), SysUser::getAvatar, avatar);
queryWrapper.eq(ObjectUtil.isNotNull(birthday), SysUser::getBirthday, birthday);
queryWrapper.like(ObjectUtil.isNotEmpty(sex), SysUser::getSex, sex);
queryWrapper.like(ObjectUtil.isNotEmpty(email), SysUser::getEmail, email);
queryWrapper.like(ObjectUtil.isNotEmpty(phone), SysUser::getPhone, phone);
queryWrapper.like(ObjectUtil.isNotEmpty(tel), SysUser::getTel, tel);
queryWrapper.like(ObjectUtil.isNotEmpty(superAdminFlag), SysUser::getSuperAdminFlag, superAdminFlag);
queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), SysUser::getStatusFlag, statusFlag);
queryWrapper.eq(ObjectUtil.isNotNull(loginCount), SysUser::getLoginCount, loginCount);
queryWrapper.like(ObjectUtil.isNotEmpty(lastLoginIp), SysUser::getLastLoginIp, lastLoginIp);
queryWrapper.eq(ObjectUtil.isNotNull(lastLoginTime), SysUser::getLastLoginTime, lastLoginTime);
queryWrapper.like(ObjectUtil.isNotEmpty(masterUserId), SysUser::getMasterUserId, masterUserId);
queryWrapper.like(ObjectUtil.isNotEmpty(expandField), SysUser::getExpandField, expandField);
queryWrapper.eq(ObjectUtil.isNotNull(versionFlag), SysUser::getVersionFlag, versionFlag);
queryWrapper.like(ObjectUtil.isNotEmpty(delFlag), SysUser::getDelFlag, delFlag);
queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysUser::getTenantId, tenantId);
// 根据状态进行查询
Integer statusFlag = sysUserRequest.getStatusFlag();
queryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag);
// 按用户排序字段排序
queryWrapper.orderByAsc(SysUser::getUserSort);
return queryWrapper;
}