From 48d64c07ea643e1b1199828f6ac36c12c05cd535 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 15 一月 2024 22:03:46 +0800
Subject: [PATCH] 2024-01-15 朱宝民 优化获取用户信息接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml | 3 ++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 4 +++-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 24 ++++++++++++++----------
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
index b73434c..1638417 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voBa;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -32,6 +33,7 @@
private List<Map<String, Object>> roleNames;
@Schema(title = "鏉冮檺鍒楄〃")
- private List<Map<String, Object>> permissions;
+ //private List<Map<String, Object>> permissions;
+ private JSONArray permissions;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
index 8575482..2eb9c8c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -65,7 +65,8 @@
SELECT
rol.id AS roleId,
rol.`name` AS roleName,
- per.permissions
+<!-- per.permissions-->
+ per.id AS perId
FROM ba_user_role use_rol
INNER JOIN ba_role rol ON rol.id = use_rol.roleId
INNER JOIN ba_role_permissions per ON per.roleId = rol.id
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 1a41c18..aaa5d31 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -5,8 +5,10 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserRoleMapper;
+import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import com.dy.pipIrrGlobal.pojoBa.BaUserRole;
import com.dy.pipIrrGlobal.voBa.VoUserInfo;
@@ -24,6 +26,7 @@
private BaUserMapper dao;
private BaUserRoleMapper urDao;
+ private BaRolePermissionsMapper baRolePermissionsMapper;
@Autowired
private void setDao(BaUserMapper dao) {
@@ -33,6 +36,11 @@
@Autowired
private void setDao(BaUserRoleMapper dao) {
this.urDao = dao;
+ }
+
+ @Autowired
+ private void setDao(BaRolePermissionsMapper dao) {
+ this.baRolePermissionsMapper = dao;
}
/**
@@ -171,7 +179,7 @@
*/
public VoUserInfo getUserInfos(Long userId) {
VoUserInfo voUserInfo = new VoUserInfo();
- String permission = "";
+ JSONArray array_permission = new JSONArray();
Map map = Optional.ofNullable(dao.getUserInfoById(userId)).orElse(new HashMap());
if(map.size() > 0) {
voUserInfo.setUserId(userId);
@@ -180,7 +188,6 @@
List list_roleIds = new ArrayList();
List list_roleNames = new ArrayList();
- List list_permissions = new ArrayList();
List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
if(list.size() > 0) {
@@ -190,18 +197,15 @@
list_roleIds.add(job.getLong("roleId"));
list_roleNames.add(job.getString("roleName"));
- String permissions = Optional.ofNullable(job.getString("permissions")).orElse("");
- if(permissions.length() > 0) {
- permissions = permissions.substring(1, permissions.length() - 1);
- permissions= permissions.replace(String.valueOf(" "), "");
- permission = permission + permissions + ",";
+ Long perId = Optional.ofNullable(job.getLong("perId")).orElse(0L);
+ BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
+ if(baRolePermissions != null) {
+ array_permission.addAll(baRolePermissions.getPermissions());
}
}
voUserInfo.setRoleIds(list_roleIds);
voUserInfo.setRoleNames(list_roleNames);
- permission = permission.substring(0, permission.length()-1);
- list_permissions.add(permission);
- voUserInfo.setPermissions(list_permissions);
+ voUserInfo.setPermissions(array_permission);
}
return voUserInfo;
}
--
Gitblit v1.8.0