From 3004cc4dbee1216a73277da7fbf9e519735e7587 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 15:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java | 4 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserRoleMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 4 +-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 8 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 6 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java | 57 ++++++++++++++++++----------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 10 ----
7 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
index 532b095..53a0514 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -46,11 +46,11 @@
List<VoController> getControllers(Map<?, ?> params);
/**
- * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
+ * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
* @param rtuAddr
* @return
*/
- List<Map<String, Object>> getControllersByCode(@Param("rtuAddr") String rtuAddr);
+ List<Map<String, Object>> getControllersByAddr(@Param("rtuAddr") String rtuAddr);
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
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..437a9f8 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;
@@ -20,7 +21,7 @@
private static final long serialVersionUID = 1L;
@Schema(title = "鐢ㄦ埛ID")
- private Long userId;
+ private String userId;
@Schema(title = "鐢ㄦ埛濮撳悕")
private String userName;
@@ -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..8840d70 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,7 @@
SELECT
rol.id AS roleId,
rol.`name` AS roleName,
- 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-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index 75cf37f..1668e2d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -220,17 +220,9 @@
</select>
- <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
+ <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃-->
<select id="getControllersByCode" resultType="java.util.Map">
SELECT id, rtuAddr FROM pr_controller WHERE rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
- </select>
-
- <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
- <select id="getControllersByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
- <include refid="Part_Column_List" />
- from pr_controller_tramp
- where rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
</select>
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
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;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index bd9311f..0eab6fc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -95,9 +95,9 @@
})
@GetMapping(path = "controller_list")
@SsoAop()
- public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){
+ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
try {
- List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>());
+ List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
if(list.size() <= 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index 9a98da4..12af178 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -65,12 +65,12 @@
}
/**
- * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
- * @param controllerCode
+ * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�
+ * @param rtuAddr
* @return
*/
- public List<Map<String, Object>> getControllersByCode(String controllerCode) {
- return prControllerMapper.getControllersByCode(controllerCode);
+ public List<Map<String, Object>> getControllersByAddr(String rtuAddr) {
+ return prControllerMapper.getControllersByAddr(rtuAddr);
}
/**
--
Gitblit v1.8.0