From fdb0de1fcbf11f7c54413ab869859f4e08ac2bf7 Mon Sep 17 00:00:00 2001 From: Jinyuanyuan <1197651512@qq.com> Date: Tue, 18 Jun 2024 14:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AF=B9=E5=BA=94=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA=E8=AF=A5=E8=A7=92=E8=89=B2=E4=B8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/SysRoleController.java | 2 + .../auth/controller/SysUserController.java | 14 ++++++ .../easy/admin/auth/dao/SysUserMapper.java | 12 +++++ .../admin/auth/dao/mapping/SysUserMapper.xml | 47 +++++++++++++++++++ .../com/easy/admin/auth/model/RoleOV.java | 16 +++++++ .../admin/auth/model/UserInfoRequest.java | 21 +++++++++ .../admin/auth/model/UserInfoResponse.java | 24 ++++++++++ .../admin/auth/service/SysUserService.java | 5 ++ .../auth/service/impl/SysUserServiceImpl.java | 38 +++++++++++++++ 9 files changed, 179 insertions(+) create mode 100644 easy-sys/src/main/java/com/easy/admin/auth/model/RoleOV.java create mode 100644 easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoRequest.java create mode 100644 easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoResponse.java diff --git a/easy-sys/src/main/java/com/easy/admin/auth/controller/SysRoleController.java b/easy-sys/src/main/java/com/easy/admin/auth/controller/SysRoleController.java index 3f946c4..19a3111 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/controller/SysRoleController.java +++ b/easy-sys/src/main/java/com/easy/admin/auth/controller/SysRoleController.java @@ -131,4 +131,6 @@ public class SysRoleController extends BaseController { public List selectRoleByDept(String deptId) { return service.selectRoleByDept(deptId); } + + } diff --git a/easy-sys/src/main/java/com/easy/admin/auth/controller/SysUserController.java b/easy-sys/src/main/java/com/easy/admin/auth/controller/SysUserController.java index ee23ac1..0669a85 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/controller/SysUserController.java +++ b/easy-sys/src/main/java/com/easy/admin/auth/controller/SysUserController.java @@ -1,6 +1,8 @@ package com.easy.admin.auth.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.easy.admin.auth.model.SysUser; +import com.easy.admin.auth.model.UserInfoRequest; import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.core.base.BaseController; import com.easy.admin.common.core.common.pagination.Page; @@ -151,4 +153,16 @@ public class SysUserController extends BaseController { public List selectUsersByIds(@PathVariable("ids") String ids) { return service.selectUsersByIds(ids); } + + /** + * 根据角色id获取该角色下的所有人员信息 + * + */ + @GetMapping("getUsers") + public Object selectUsersByRoleId(UserInfoRequest request, + @RequestParam(name="condition", defaultValue="condition")String condition, + @RequestParam(name="current", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return service.getUsersByCondition(condition,request,pageNo,pageSize); + } } diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java b/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java index 07e9c50..f98d54b 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java +++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/SysUserMapper.java @@ -2,6 +2,9 @@ package com.easy.admin.auth.dao; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.easy.admin.auth.model.UserInfoRequest; +import com.easy.admin.auth.model.UserInfoResponse; import com.easy.admin.common.core.common.pagination.Page; import com.easy.admin.auth.model.SysUser; import org.apache.ibatis.annotations.Param; @@ -123,4 +126,13 @@ public interface SysUserMapper extends BaseMapper { */ String getDeptIdByUserId(@Param("id") String id); List> getUserDictByRoles(@Param("roles") List roles); + + + + IPage getAllUserPage(Page page, @Param("User") UserInfoRequest request); + + IPage getUserPageByCondition(Page page, @Param("User") UserInfoRequest request,@Param("condition") String condition); + + IPage getUserPageByConditions(Page page, @Param("User") UserInfoRequest request,@Param("condition") String condition1,@Param("condition1")String condition2); + } \ No newline at end of file diff --git a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml index 0cd274f..3d9ebc8 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml +++ b/easy-sys/src/main/java/com/easy/admin/auth/dao/mapping/SysUserMapper.xml @@ -24,6 +24,21 @@ + + + + + + + + + + + + + update sys_user set status = #{status} @@ -111,4 +126,36 @@ ) rr on rr.user_id = u.id + + + \ No newline at end of file diff --git a/easy-sys/src/main/java/com/easy/admin/auth/model/RoleOV.java b/easy-sys/src/main/java/com/easy/admin/auth/model/RoleOV.java new file mode 100644 index 0000000..a2f26bd --- /dev/null +++ b/easy-sys/src/main/java/com/easy/admin/auth/model/RoleOV.java @@ -0,0 +1,16 @@ +package com.easy.admin.auth.model; + + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(value = {"handler"}) + +public class RoleOV { + + private String roleId; + + private String roleName; +} diff --git a/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoRequest.java b/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoRequest.java new file mode 100644 index 0000000..e013e64 --- /dev/null +++ b/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoRequest.java @@ -0,0 +1,21 @@ +package com.easy.admin.auth.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + + + +@Data +@JsonIgnoreProperties(value = {"handler"}) +public class UserInfoRequest { + + + private String nickname; + + private String role; + + private String phoneNumber; + + private String workplace; +} diff --git a/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoResponse.java b/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoResponse.java new file mode 100644 index 0000000..87cb4f5 --- /dev/null +++ b/easy-sys/src/main/java/com/easy/admin/auth/model/UserInfoResponse.java @@ -0,0 +1,24 @@ +package com.easy.admin.auth.model; + + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +import java.util.List; + +@Data +@JsonIgnoreProperties(value = {"handler"}) +public class UserInfoResponse { + + private String id; + private String nickname; + + private String sex; + + private String phoneNumber; + + private String workplace; + + private List role; +} diff --git a/easy-sys/src/main/java/com/easy/admin/auth/service/SysUserService.java b/easy-sys/src/main/java/com/easy/admin/auth/service/SysUserService.java index 84377ca..fdc5c2e 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/service/SysUserService.java +++ b/easy-sys/src/main/java/com/easy/admin/auth/service/SysUserService.java @@ -1,6 +1,9 @@ package com.easy.admin.auth.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.easy.admin.auth.model.UserInfoRequest; +import com.easy.admin.auth.model.UserInfoResponse; import com.easy.admin.common.core.common.pagination.Page; import com.easy.admin.auth.model.SysUser; @@ -184,4 +187,6 @@ public interface SysUserService extends IService { List> getUserDictByRoles(String roles); + IPage getUsersByCondition(String condition, UserInfoRequest request, Integer pageNo, Integer pageSize); + } \ No newline at end of file diff --git a/easy-sys/src/main/java/com/easy/admin/auth/service/impl/SysUserServiceImpl.java b/easy-sys/src/main/java/com/easy/admin/auth/service/impl/SysUserServiceImpl.java index a1ffd41..7d3014f 100644 --- a/easy-sys/src/main/java/com/easy/admin/auth/service/impl/SysUserServiceImpl.java +++ b/easy-sys/src/main/java/com/easy/admin/auth/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easy.admin.auth.common.constant.SessionConst; import com.easy.admin.auth.common.constant.SysRoleConst; @@ -14,6 +15,8 @@ import com.easy.admin.auth.common.status.SysUserStatus; import com.easy.admin.auth.dao.SysUserMapper; import com.easy.admin.auth.model.SysUser; import com.easy.admin.auth.model.SysUserRole; +import com.easy.admin.auth.model.UserInfoRequest; +import com.easy.admin.auth.model.UserInfoResponse; import com.easy.admin.auth.service.SysUserRoleService; import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.core.common.pagination.Page; @@ -387,4 +390,39 @@ public class SysUserServiceImpl extends ServiceImpl impl } return null; } + + @Override + public IPage getUsersByCondition(String condition, UserInfoRequest request, Integer pageNo, Integer pageSize) { + Page page=new Page<>(pageNo,pageSize); + IPage result=new Page<>(); + if(condition.equals("all")){ + //信息化保障团队，显示所有人员信息 + result=userMapper.getAllUserPage(page, request); + } else if (condition.equals("task")) { + //任务牵头处室人员信息 + condition="任务牵头处室"; + result = userMapper.getUserPageByCondition(page,request,condition); + }else if (condition.equals("team")){ + //信息化保障团队人员 + condition="信息化保障团队"; + String condition1="总咨询单位"; + result=userMapper.getUserPageByConditions(page,request,condition,condition1); + } else if (condition.equals("guazhi")) { + //挂职人员 + condition="信息化保障团队"; + result = userMapper.getUserPageByCondition(page,request,condition); + }else if (condition.equals("consult")) { + //咨询人员 + condition="总咨询单位"; + result = userMapper.getUserPageByCondition(page,request,condition); + }else if (condition.equals("contact")) { + //项目联系人 + condition="项目联系人"; + result = userMapper.getUserPageByCondition(page,request,condition); + } + + return result; + } + + }