From c4dc1c8f9fd0da0d9a7a3f43bcf88d2a91806cb1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 29 Jul 2022 11:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 37 +++++++++++++++++++ .../modules/extRepo/entity/ERFTreeData.java | 20 +++++----- .../modules/extRepo/entity/ExtRepoFolder.java | 4 +- .../mapper/xml/ExtRepoFolderMapper.xml | 8 ++-- .../impl/ExtRepoFolderServiceImpl.java | 28 +++++++------- 5 files changed, 68 insertions(+), 29 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 7baf9a923..fa55336d4 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -512,3 +512,40 @@ INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', ' -- 菜单管理 添加对外报告文件夹管理按钮权限 2022-07-28 已同步生产环境 INSERT INTO `sys_permission` VALUES ('1552182885208608770', '1549937961282908162', '对外报告文件夹管理', '', NULL, NULL, NULL, 2, 'externalReports:folder', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-7-27 14:43:33', NULL, NULL, 0, 0, '1', 0, 'External Report Folder Management '); + +-- 对外报告文件夹表 2022-7-29 已同步生产环境 +DROP TABLE IF EXISTS `ext_repo_folder`; +CREATE TABLE `ext_repo_folder` ( + `id` varchar(36) NOT NULL, + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `folder_name` varchar(255) DEFAULT NULL COMMENT '文件夹名称', + `order_id` int(11) DEFAULT NULL COMMENT '文件夹排序', + `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', + `auth_view_ids_name` varchar(2000) DEFAULT NULL COMMENT '查看权限人员', + `auth_manage_ids_name` varchar(2000) DEFAULT NULL COMMENT '管理权限人员', + `auth_view_ids` varchar(2000) DEFAULT NULL COMMENT '查看权限人员id', + `auth_manage_ids` varchar(2000) DEFAULT NULL COMMENT '管理权限人员id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +INSERT INTO `ext_repo_folder` VALUES ('1552846304994131970', 'admin', '2022-07-01 11:11:11', 'admin', '2022-11-11 11:11:11', 'A01', '文件夹', '1', 'root', '', '', '', ''); + +-- 对外报告数据表 2022-7-29 已同步生产环境 +DROP TABLE IF EXISTS `ext_repo_data`; +CREATE TABLE `ext_repo_data` ( + `id` varchar(36) NOT NULL, + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `file_key` varchar(255) DEFAULT NULL COMMENT '文件标识', + `file_name` varchar(255) DEFAULT NULL COMMENT '文件名称', + `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明', + `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java index a03327422..d9d65aecd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java @@ -46,12 +46,12 @@ public class ERFTreeData implements Comparable { /** * 查看权限人员 */ - private String authView = ""; + private String authViewIdsName = ""; /** * 管理权限人员 */ - private String authManage = ""; + private String authManageIdsName = ""; /** * 查看权限人员id @@ -135,20 +135,20 @@ public class ERFTreeData implements Comparable { this.folderName = folderName; } - public String getAuthView() { - return authView; + public String getAuthViewIdsName() { + return authViewIdsName; } - public void setAuthView(String authView) { - this.authView = authView; + public void setAuthViewIdsName(String authViewIdsName) { + this.authViewIdsName = authViewIdsName; } - public String getAuthManage() { - return authManage; + public String getAuthManageIdsName() { + return authManageIdsName; } - public void setAuthManage(String authManage) { - this.authManage = authManage; + public void setAuthManageIdsName(String authManageIdsName) { + this.authManageIdsName = authManageIdsName; } public String getAuthViewIds() { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java index b6915fc50..972a8010d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoFolder.java @@ -76,12 +76,12 @@ public class ExtRepoFolder implements Serializable { /**查看权限人员*/ @Excel(name = "查看权限人员", width = 15) @ApiModelProperty(value = "查看权限人员") - private String authView; + private String authViewIdsName; /**管理权限人员*/ @Excel(name = "管理权限人员", width = 15) @ApiModelProperty(value = "管理权限人员") - private String authManage; + private String authManageIdsName; /**查看权限人员id*/ @Excel(name = "查看权限人员id", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/mapper/xml/ExtRepoFolderMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/mapper/xml/ExtRepoFolderMapper.xml index a742f17b9..3ff05664c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/mapper/xml/ExtRepoFolderMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/mapper/xml/ExtRepoFolderMapper.xml @@ -11,9 +11,9 @@ - - - - + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index ec923e61a..136271e33 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -53,9 +53,11 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl authManage_orig = getAuthMap(erf_orig.getAuthManage(), erf_orig.getAuthManageIds()); - Map authManage_new = getAuthMap(erf_new.getAuthManage(), erf_new.getAuthManageIds()); + Map authManage_orig = getAuthMap(erf_orig.getAuthManageIdsName(), erf_orig.getAuthManageIds()); + Map authManage_new = getAuthMap(erf_new.getAuthManageIdsName(), erf_new.getAuthManageIds()); //增加管理权限的人 Map addManageRole = getDefMap(authManage_new, authManage_orig); //删除管理权限的人 Map delManageRole = getDefMap(authManage_orig, authManage_new); //查看权限 - Map authView_orig = getAuthMap(erf_orig.getAuthView(), erf_orig.getAuthViewIds()); - Map authView_new = getAuthMap(erf_new.getAuthView(), erf_new.getAuthViewIds()); + Map authView_orig = getAuthMap(erf_orig.getAuthViewIdsName(), erf_orig.getAuthViewIds()); + Map authView_new = getAuthMap(erf_new.getAuthViewIdsName(), erf_new.getAuthViewIds()); //增加查看权限的人 Map addViewRole = getDefMap(authView_new, authView_orig); //删除查看权限的人 @@ -140,8 +142,8 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl updateFolder = new ArrayList(); for (ExtRepoFolder erf : allSubFolder) { boolean isChange = false; - Map authManage_erf = getAuthMap(erf.getAuthManage(), erf.getAuthManageIds()); - Map authView_erf = getAuthMap(erf.getAuthView(), erf.getAuthViewIds()); + Map authManage_erf = getAuthMap(erf.getAuthManageIdsName(), erf.getAuthManageIds()); + Map authView_erf = getAuthMap(erf.getAuthViewIdsName(), erf.getAuthViewIds()); for (String add : addManageRole.keySet()) { if (!authManage_erf.keySet().contains(add)) { authManage_erf.put(add, addManageRole.get(add)); @@ -169,9 +171,9 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl