From 3028d5e6c90aa8768970bee0eeafea4a8228b2b6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 17:14:57 +0800
Subject: [PATCH] 1、完善协议解析值对象属性名称
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
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..77591e9 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,38 +179,45 @@
*/
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);
+ voUserInfo.setUserId(String.valueOf(userId));
voUserInfo.setUserName(map.get("userName").toString());
}
+ /**
+ * 娣诲姞瑙掕壊缂栧彿鍒楄〃銆佽鑹插悕绉板垪琛ㄣ�佹潈闄愬垪琛�
+ * 濡傛灉褰撳墠鐢ㄦ埛鏄秴绾х鐞嗗憳锛屽垯涓婅堪涓夐」鍧囦负admin
+ */
List list_roleIds = new ArrayList();
List list_roleNames = new ArrayList();
- List list_permissions = new ArrayList();
+ if(voUserInfo.getUserName().equals("瓒呯骇绠＄悊鍛�")) {
+ array_permission.add("admin");
+ list_roleIds.add("admin");
+ list_roleNames.add("admin");
+ } else {
+ List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
+ if(list.size() > 0) {
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject job = array.getJSONObject(i);
+ list_roleIds.add(job.getLong("roleId").toString());
+ list_roleNames.add(job.getString("roleName"));
- List<Map<String, Object>> list = Optional.ofNullable(urDao.getPermissionsByUserId(userId)).orElse(new ArrayList<>());
- if(list.size() > 0) {
- JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
- for (int i = 0; i < array.size(); i++) {
- JSONObject job = array.getJSONObject(i);
- 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.setRoleIds(list_roleIds);
+ voUserInfo.setRoleNames(list_roleNames);
+ voUserInfo.setPermissions(array_permission);
+
+
return voUserInfo;
}
}
--
Gitblit v1.8.0