From 104ea80309661013121699d156a6a7311604f670 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Mon, 19 Aug 2024 10:14:06 +0800 Subject: [PATCH] =?UTF-8?q?app=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=9F=A5=E7=AE=A1=E7=90=86=E3=80=81=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E3=80=81=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E8=AF=81=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 13 ++++++++++++ .../com/bonus/aqgqj/system/dao/UserDao.java | 8 +++++++ .../aqgqj/system/service/UserService.java | 7 +++++++ .../system/service/impl/TokenServiceImpl.java | 5 +++-- .../system/service/impl/UserServiceImpl.java | 11 ++++++++++ .../com/bonus/aqgqj/system/vo/SysMenuVo.java | 2 ++ .../java/com/bonus/aqgqj/system/vo/Token.java | 16 +++++++++++++- .../resources/mappers/app/HomeAppMapper.xml | 2 +- .../resources/mappers/basis/HomeMapper.xml | 2 +- .../resources/mappers/system/UserMapper.xml | 21 ++++++++++++++++++- 10 files changed, 81 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java index fdb4f0d..02b7979 100644 --- a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java @@ -9,6 +9,7 @@ import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.system.dao.UserDao; import com.bonus.aqgqj.system.vo.EncryptedReq; import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.SysMenuVo; import com.bonus.aqgqj.system.vo.UserDto; import com.bonus.aqgqj.model.PasswordConfig; import com.bonus.aqgqj.model.SysUser; @@ -331,4 +332,16 @@ public class UserController { return ServerResponse.createErroe("操作失败"); } + @PostMapping(value = "getRoleAppAuth") + @LogAnnotation(operModul = "用户管理", operation = "获取角色App权限", operDesc = "系统级事件",operType="查询") + public ServerResponse getRoleAppAuth() { + try { + List list = userService.getRoleAppAuth(); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + } diff --git a/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java index c162d97..38f3f8f 100644 --- a/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java @@ -7,6 +7,7 @@ import com.bonus.aqgqj.base.entity.DtreeVo; import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.system.vo.LoginUser; import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.SysMenuVo; import com.bonus.aqgqj.system.vo.UserDto; import com.bonus.aqgqj.model.PasswordConfig; import com.bonus.aqgqj.model.SysUser; @@ -168,4 +169,11 @@ public interface UserDao { * @return */ List getRoleAll(); + + /** + * 根据角色编码查询角色菜单权限 + * @param roleCode + * @return + */ + List getRoleAppAuth(String roleCode); } diff --git a/src/main/java/com/bonus/aqgqj/system/service/UserService.java b/src/main/java/com/bonus/aqgqj/system/service/UserService.java index 32719e7..3975b44 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/UserService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/UserService.java @@ -2,6 +2,7 @@ package com.bonus.aqgqj.system.service; import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.SysMenuVo; import com.bonus.aqgqj.system.vo.UserDto; import com.bonus.aqgqj.model.PasswordConfig; import com.bonus.aqgqj.model.SysUser; @@ -137,4 +138,10 @@ public interface UserService { * @return */ List getRoleAll(); + + /** + * 查询角色下App权限 + * @return + */ + List getRoleAppAuth(); } diff --git a/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java index 33a6f79..04e9ef0 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java @@ -7,6 +7,7 @@ import com.bonus.aqgqj.system.vo.Token; import com.bonus.aqgqj.system.service.SysLogService; import com.bonus.aqgqj.system.service.TokenService; import com.bonus.aqgqj.utils.JwtHelper; +import com.bonus.aqgqj.utils.UserUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; @@ -38,8 +39,8 @@ public class TokenServiceImpl implements TokenService { cacheLoginUser(loginUser); // 登陆日志 // logService.save(loginUser.getId(), "登陆", true, null); - - return new Token(token, loginUser.getLoginTime(),200); + String roleCode= UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getRoleCode() : ""; + return new Token(token, loginUser.getLoginTime(),200,roleCode); } private void cacheLoginUser(LoginUser loginUser) { diff --git a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java index 5b6835c..c3b5616 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java @@ -7,6 +7,7 @@ import com.bonus.aqgqj.base.entity.DtreeVo; import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.system.vo.Org; import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.system.vo.SysMenuVo; import com.bonus.aqgqj.utils.ServerResponse; import com.bonus.aqgqj.utils.StringHelper; import com.bonus.aqgqj.utils.UserUtil; @@ -222,6 +223,16 @@ public class UserServiceImpl implements UserService { return userDao.getRoleAll(); } + /** + * 获取角色下App权限菜单 + */ + @Override + public List getRoleAppAuth() { + //获取当前登录用户角色编码 + String roleCode = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getRoleCode() : ""; + return userDao.getRoleAppAuth(roleCode); + } + /** * 修改用户 */ diff --git a/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java b/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java index d72cd46..9812b7f 100644 --- a/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java @@ -5,6 +5,8 @@ import lombok.Data; @Data public class SysMenuVo { + private Integer menuId; + private String menuName;//菜單名稱 private String menuUrl; diff --git a/src/main/java/com/bonus/aqgqj/system/vo/Token.java b/src/main/java/com/bonus/aqgqj/system/vo/Token.java index aa36096..46d4752 100644 --- a/src/main/java/com/bonus/aqgqj/system/vo/Token.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/Token.java @@ -1,5 +1,7 @@ package com.bonus.aqgqj.system.vo; +import com.bonus.aqgqj.utils.UserUtil; + import java.io.Serializable; /** @@ -19,11 +21,15 @@ public class Token implements Serializable { private Integer code; - public Token(String token, Long loginTime, Integer code) { + /** 角色编码 */ + private String roleCode; + + public Token(String token, Long loginTime, Integer code, String roleCode) { super(); this.token = token; this.loginTime = loginTime; this.code = code; + this.roleCode = roleCode; } public String getToken() { @@ -49,4 +55,12 @@ public class Token implements Serializable { public void setCode(Integer code) { this.code = code; } + + public String getRoleCode() { + return roleCode; + } + + public void setRoleCode(String roleCode) { + this.roleCode = roleCode; + } } diff --git a/src/main/resources/mappers/app/HomeAppMapper.xml b/src/main/resources/mappers/app/HomeAppMapper.xml index 8e34435..34f0ed8 100644 --- a/src/main/resources/mappers/app/HomeAppMapper.xml +++ b/src/main/resources/mappers/app/HomeAppMapper.xml @@ -5,7 +5,7 @@ select sum(case when team_id is null then 1 else 0 end ) as dispatchWorkNum ,sum(case when team_id is not null and process_status is null then 1 else 0 end ) as testNum - ,sum(case when process_status='1' and is_er=0 then 1 else 0 end ) as reloadReviewNUm + ,sum(case when process_status='1' and is_er=1 then 1 else 0 end ) as reloadReviewNUm ,sum(case when process_status='1' and is_er is null and audti_status!='2' then 1 else 0 end ) as reviewNUm ,sum(case when process_status='2' and audti_status!='2' then 1 else 0 end ) as examineNum ,sum(case when process_status='3' and audti_status!='2' then 1 else 0 end ) as approvalNum diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml index d635d42..897b01f 100644 --- a/src/main/resources/mappers/basis/HomeMapper.xml +++ b/src/main/resources/mappers/basis/HomeMapper.xml @@ -5,7 +5,7 @@ select sum(case when team_id is null then 1 else 0 end ) as dispatchWorkNum ,sum(case when team_id is not null and process_status is null then 1 else 0 end ) as testNum - ,sum(case when process_status='1' and is_er=0 then 1 else 0 end ) as reloadReviewNUm + ,sum(case when process_status='1' and is_er=1 then 1 else 0 end ) as reloadReviewNUm ,sum(case when process_status='1' and is_er is null and audti_status!='2' then 1 else 0 end ) as reviewNUm ,sum(case when process_status='2' and audti_status!='2' then 1 else 0 end ) as examineNum ,sum(case when process_status='3' and audti_status!='2' then 1 else 0 end ) as approvalNum diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index 4a09af1..ab03364 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -213,8 +213,27 @@ where t.del_flag = 0 and t.state = 1 + - + insert into sys_role_user(roleId, userId) values (#{roleId}, #{userId})