用户授权修改

src/main/java/com/scbfkj/uni/api/SecurityApi.java

@@ -147,7 +147,7 @@ public class SecurityApi {
 
     @PostMapping("/user/authorization")
     public ResponseEntity<Map<String, Object>> authorization(@RequestBody Map<String, Object> body) throws Exception {
-        return ResponseEntity.ok(AuthorizationScriptUtil.authorization("1", body));
+        return ResponseEntity.ok(AuthorizationScriptUtil.authorization( body));
     }
 
     /**
@@ -156,6 +156,6 @@ public class SecurityApi {
 
     @PostMapping("/user/getAuthorization")
     public ResponseEntity<Map<String, Object>> getAuthorization(@RequestBody Map<String, Object> body) throws Exception {
-        return ResponseEntity.ok(AuthorizationScriptUtil.getAuthorization("1", body));
+        return ResponseEntity.ok(AuthorizationScriptUtil.getAuthorization( body));
     }
 }

src/main/java/com/scbfkj/uni/library/script/AuthorizationScriptUtil.java

@@ -11,7 +11,7 @@ public class AuthorizationScriptUtil {
 
     private static final DataBase DATABASE = new DataBase();
 
-    public static Map<String, Object> authorization(String datasourceId, Map<String, Object> data) throws Exception {
+    public static Map<String, Object> authorization(Map<String, Object> data) throws Exception {
 
         List<Object> dataContent = Optional.ofNullable(DataFormatUtil.toList(data.get("datacontent"))).orElse(new ArrayList<>());
         if (dataContent.isEmpty()) {
@@ -22,21 +22,36 @@ public class AuthorizationScriptUtil {
         Object type = data.get("type").toString();
         String sql = null;
 
-        if (type.equals("1")) {
+        if ("1".equals(type)) {
             if ("1".equals(event)) {
                 sql = """
-                        insert into userpermissions (userid, pageconfigurationid)
-                        values (%s, ?)""".formatted(id);
+                        insert into userpermissions (userid, pageconfigurationid,serviceid)
+                        values (?, ?, ?)""";
+                int[] result = DATABASE.updateBatch(Config.getSecurityConnectionStr(), sql, dataContent.stream().map(it -> {
+                    if (it instanceof Map<?, ?> map) {
+                        return new Object[]{id, map.get("pageconfigurationid"), map.get("serviceid")};
+                    } else {
+                        return new Object[]{it};
+                    }
+                }).toList());
+                return UniReturnUtil.success(result);
             } else if ("3".equals(event)) {
                 sql = """
                         delete
                         from userpermissions
-                        where userid=%s and pageconfigurationid=?""".formatted(id);
+                        where userid=? and pageconfigurationid = ?""";
+                int[] result = DATABASE.updateBatch(Config.getSecurityConnectionStr(), sql, dataContent.stream().map(it -> {
+                    if (it instanceof Map<?, ?> map) {
+                        return new Object[]{id, map.get("pageconfigurationid")};
+                    } else {
+                        return new Object[]{it};
+                    }
+                }).toList());
+                return UniReturnUtil.success(result);
             }
-            int[] result = DATABASE.updateBatch(queryConnectionStr(datasourceId), sql, dataContent.stream().map(it -> new Object[]{it}).toList());
-            return UniReturnUtil.success(result);
-        } else if (type.equals("2")) {
-            Set<Object> childrenGroup = getChildrenGroup(datasourceId, id);
+
+        } else if ("2".equals(type)) {
+            Set<Object> childrenGroup = getChildrenGroup(id);
             Map<String, List<Object[]>> children = new HashMap<>();
             ArrayList<Object[]> lines = new ArrayList<>();
             for (Object o : dataContent) {
@@ -49,7 +64,7 @@ public class AuthorizationScriptUtil {
             }
 
             ArrayList<Object[]> userInfoValues = new ArrayList<>();
-            Set<Object> childrenUserInfo = getChildrenUserInfo(datasourceId, childrenGroup);
+            Set<Object> childrenUserInfo = getChildrenUserInfo(childrenGroup);
             for (Object id1 : childrenUserInfo) {
                 for (Object o : dataContent) {
                     userInfoValues.add(new Object[]{id1, o});
@@ -84,41 +99,41 @@ public class AuthorizationScriptUtil {
                         """;
                 children.put(sql, userInfoValues);
             }
-            DATABASE.updateBatchExtend(queryConnectionStr(datasourceId), children);
+            DATABASE.updateBatchExtend(Config.getSecurityConnectionStr(), children);
             return UniReturnUtil.success(true);
         }
         return UniReturnUtil.fail("类型错误");
 
     }
 
-    public static Set<Object> getChildrenGroup(String datasourceId, String id) throws Exception {
+    public static Set<Object> getChildrenGroup(String id) throws Exception {
         Set<Object> children = new HashSet<>();
         String sql = """
                                 select usergroupid
                 from usergroup where superiorid=?""";
-        List<Map<String, Object>> result = DATABASE.query(queryConnectionStr(datasourceId), sql, id);
+        List<Map<String, Object>> result = DATABASE.query(Config.getSecurityConnectionStr(), sql, id);
         for (Map<String, Object> it : result) {
-            children.addAll(getChildrenGroup(datasourceId, it.get("usergroupid").toString()));
+            children.addAll(getChildrenGroup(it.get("usergroupid").toString()));
         }
         return children;
     }
 
-    public static Set<Object> getChildrenUserInfo(String datasourceId, Set<Object> groupIds) throws Exception {
+    public static Set<Object> getChildrenUserInfo(Set<Object> groupIds) throws Exception {
         Set<Object> children = new HashSet<>();
         String sql = """
                                 select userid
                 from userinfo where usergroupid=?""";
-        List<Map<String, Object>> result = DATABASE.queryBatch(queryConnectionStr(datasourceId), sql, groupIds.stream().map(it -> new Object[]{it}).toList());
+        List<Map<String, Object>> result = DATABASE.queryBatch(Config.getSecurityConnectionStr(), sql, groupIds.stream().map(it -> new Object[]{it}).toList());
         for (Map<String, Object> it : result) {
-            children.addAll(getChildrenGroup(datasourceId, it.get("userid").toString()));
+            children.addAll(getChildrenGroup(it.get("userid").toString()));
         }
         return children;
     }
 
-    public static Map<String, Object> getAuthorization(String datasourceId, Map<String, Object> data) throws Exception {
+    public static Map<String, Object> getAuthorization(Map<String, Object> data) throws Exception {
         List<Map<String, Object>> dataContent = Optional.ofNullable(DataFormatUtil.toList(data.get("datacontent"))).map(it -> it.stream().map(d -> {
             Map<?, ?> map = DataFormatUtil.toMap(d);
-            return (Map<String, Object>) map;
+            return map;
         }).toList()).orElse(new ArrayList<>());
         if (dataContent.isEmpty()) {
             return UniReturnUtil.fail("datacontent 为空");
@@ -126,14 +141,14 @@ public class AuthorizationScriptUtil {
         Map<String, Object> value = dataContent.get(0);
         Object id = value.get("id");
         List<Map<String, Object>> results;
-        if (value.get("type").toString().equals("2")) {
-            results = DATABASE.query(queryConnectionStr(datasourceId), """
+        if ("2".equals(value.get("type").toString())) {
+            results = DATABASE.query(Config.getSecurityConnectionStr(), """
                     select distinct pageconfiguration.*,selectcolumnlist,filterset
                     from usergrouppermissions
                              right join pageconfiguration on pageconfiguration.pageconfigurationid = usergrouppermissions.pageconfigurationid
                     where usergroupid = ?""", id);
         } else {
-            results = DATABASE.query(queryConnectionStr(datasourceId), """
+            results = DATABASE.query(Config.getSecurityConnectionStr(), """
                     select  distinct pageconfiguration.*,selectcolumnlist,filterset
                     from userpermissions
                         right join pageconfiguration on pageconfiguration.pageconfigurationid = userpermissions.pageconfigurationid  
@@ -142,27 +157,4 @@ public class AuthorizationScriptUtil {
 
         return UniReturnUtil.success(results);
     }
-
-
-    public static String queryConnectionStr(String datasourceId) throws Exception {
-        List<Map<String, Object>> result = DATABASE.query(Config.getCenterConnectionStr(), """
-                select datasourceid,
-                       host,
-                       username,
-                       password,
-                       driverclassname
-                from datasource
-                where datasourceid = ?""", datasourceId);
-        if (result.isEmpty()) {
-            throw new RuntimeException("数据源错误：没有找到数据源");
-        }
-        return DataFormatUtil.toString(result.stream().findFirst().map(it -> {
-            HashMap<String, Object> hashMap = new HashMap<>();
-            hashMap.put("jdbcUrl", it.get("host"));
-            hashMap.put("username", it.get("username"));
-            hashMap.put("password", it.get("password"));
-            hashMap.put("driverClassName", it.get("driverclassname"));
-            return hashMap;
-        }).get());
-    }
 }