From 92d8fe84e6c816e13e7b66a05d0bf1e2b0489595 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Sep 2022 14:03:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96=E5=AD=90=E7=BA=A7=E5=92=8C?= =?UTF-8?q?=E7=88=B6=E7=BA=A7=E5=87=BD=E6=95=B0=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=9B=A0=E5=9E=83=E5=9C=BE=E6=95=B0=E6=8D=AE=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=8E=AF=E8=B7=AF=E5=AF=BC=E8=87=B4=E5=BE=AA=E7=8E=AF=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V40__1.15.sql | 82 ++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index a6e5edda74..3afef11722 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -126,4 +126,84 @@ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_typ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`, `copy_id`) VALUES ('d55c4d88-3b0a-11ed-8009-0242ac130005', '379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1663915323000, NULL, NULL, NULL); INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`) VALUES ('379c3124-7a30-4c1b-8ae4-de23eaf34b71', 'bdfcc324-1181-46a6-b681-a453517c4ffa', 'dataset', '2', 'user', 1663915323123, NULL, 'admin', NULL, NULL, NULL); -DELETE from `sys_menu` where `menu_id` = 50; \ No newline at end of file +DELETE from `sys_menu` where `menu_id` = 50; + + + +-- ---------------------------- +-- Function structure for GET_V_AUTH_MODEL_WITH_CHILDREN +-- ---------------------------- +DROP FUNCTION IF EXISTS `GET_V_AUTH_MODEL_WITH_CHILDREN`; +delimiter ;; +CREATE FUNCTION `GET_V_AUTH_MODEL_WITH_CHILDREN`(parentId longtext,modelType varchar(255)) + RETURNS longtext CHARSET utf8mb4 + READS SQL DATA +BEGIN + +DECLARE oTemp longtext; + +DECLARE oTempChild longtext; + +DECLARE levelCount INTEGER; + +SET levelCount = 0; + +SET oTemp = ''; + +SET oTempChild = CAST(parentId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; + +WHILE oTempChild IS NOT NULL and levelCount < 15 + +DO + +SET oTemp = CONCAT(oTemp,',',oTempChild); + +SELECT GROUP_CONCAT(id) INTO oTempChild FROM V_AUTH_MODEL WHERE FIND_IN_SET(pid,oTempChild) > 0 and V_AUTH_MODEL.model_type=modelType order by id asc; + +END WHILE; + +RETURN oTemp; + +END +;; +delimiter ; + +-- ---------------------------- +-- Function structure for GET_V_AUTH_MODEL_WITH_PARENT +-- ---------------------------- +DROP FUNCTION IF EXISTS `GET_V_AUTH_MODEL_WITH_PARENT`; +delimiter ;; +CREATE FUNCTION `GET_V_AUTH_MODEL_WITH_PARENT`(childrenId longtext,modelType varchar(255)) + RETURNS longtext CHARSET utf8mb4 + READS SQL DATA +BEGIN + +DECLARE oTemp longtext; + +DECLARE oTempParent longtext; + +DECLARE levelCount INTEGER; + +SET levelCount = 0; + +SET oTemp = ''; + +SET oTempParent = CAST(childrenId AS CHAR CHARACTER set utf8mb4) COLLATE utf8mb4_general_ci; + +WHILE oTempParent IS NOT NULL and levelCount < 15 + +DO + +SET oTemp = CONCAT(oTemp,',',oTempParent); + +SET levelCount = levelCount + 1; + +SELECT GROUP_CONCAT(distinct pid) INTO oTempParent FROM V_AUTH_MODEL WHERE FIND_IN_SET(id,oTempParent) > 0 and V_AUTH_MODEL.model_type=modelType order by pid asc; + +END WHILE; + +RETURN oTemp; + +END +;; +delimiter ; From 7f24ee745ce58aede86597234d9d23edaf8dec18 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 27 Sep 2022 14:21:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96=E5=AD=90=E7=BA=A7=E5=92=8C?= =?UTF-8?q?=E7=88=B6=E7=BA=A7=E5=87=BD=E6=95=B0=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=9B=A0=E5=9E=83=E5=9C=BE=E6=95=B0=E6=8D=AE=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=8E=AF=E8=B7=AF=E5=AF=BC=E8=87=B4=E5=BE=AA=E7=8E=AF=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V40__1.15.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index 3afef11722..f4e4faee31 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -158,6 +158,8 @@ DO SET oTemp = CONCAT(oTemp,',',oTempChild); +SET levelCount = 0; + SELECT GROUP_CONCAT(id) INTO oTempChild FROM V_AUTH_MODEL WHERE FIND_IN_SET(pid,oTempChild) > 0 and V_AUTH_MODEL.model_type=modelType order by id asc; END WHILE;