mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-08 04:39:00 +08:00
feat(security): 为关键接口添加权限控制注解
- 在SysPublicParamController等Controller的分页查询方法添加@HasPermission注解 - 新增sys_user_view等权限菜单项到数据库 - 更新角色菜单关联表以包含新增权限 - 修复渗透测试发现的权限控制缺失问题
This commit is contained in:
PIG AI authored and pigcloud committed
1 parent
c6c76b3cbd
commit
02e60b3968
12 files changed
+61
-23
No files matched your search
@@ -538,6 +538,7 @@ INSERT INTO `sys_menu` VALUES (1101,'用户新增','sys_user_add',NULL,NULL,1100
|
||||
INSERT INTO `sys_menu` VALUES (1102,'用户修改','sys_user_edit',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:52:48',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1103,'用户删除','sys_user_del',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1104,'导入导出','sys_user_export',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1105,'用户查看','sys_user_view',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1200,'菜单管理',NULL,'/admin/system/menu/index',NULL,1000,'iconfont icon-caidan','1',2,'0','0','0','','2017-11-08 09:57:27','admin','2023-11-01 16:40:39','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1201,'菜单新增','sys_menu_add',NULL,NULL,1200,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:15:53',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1202,'菜单修改','sys_menu_edit',NULL,NULL,1200,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:16:23',' ','2021-05-25 03:12:55','0',1);
|
||||
@@ -548,6 +549,7 @@ INSERT INTO `sys_menu` VALUES (1302,'角色修改','sys_role_edit',NULL,NULL,130
|
||||
INSERT INTO `sys_menu` VALUES (1303,'角色删除','sys_role_del',NULL,NULL,1300,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:14:59',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1304,'分配权限','sys_role_perm',NULL,NULL,1300,NULL,'1',1,'0',NULL,'1',' ','2018-04-20 07:22:55',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1305,'角色导入导出','sys_role_export',NULL,NULL,1300,NULL,'1',4,'0',NULL,'1',' ','2022-03-26 15:54:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1306,'角色查看','sys_role_view',NULL,NULL,1300,NULL,'1',4,'0',NULL,'1',' ','2022-03-26 15:54:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1400,'部门管理',NULL,'/admin/system/dept/index',NULL,1000,'iconfont icon-bumenguanli','1',4,'0',NULL,'0','','2018-01-20 13:17:19','admin','2023-11-01 16:40:30','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1401,'部门新增','sys_dept_add',NULL,NULL,1400,NULL,'1',1,'0',NULL,'1',' ','2018-01-20 14:56:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1402,'部门修改','sys_dept_edit',NULL,NULL,1400,NULL,'1',1,'0',NULL,'1',' ','2018-01-20 14:56:59',' ','2021-05-25 03:12:55','0',1);
|
||||
@@ -562,6 +564,7 @@ INSERT INTO `sys_menu` VALUES (1505,'租户套餐删除','sys_systenantmenu_del'
|
||||
INSERT INTO `sys_menu` VALUES (1506,'租户套餐编辑','sys_systenantmenu_edit',NULL,NULL,1500,'1','1',1,'0',NULL,'1','admin','2022-12-09 14:04:19','admin','2023-01-11 05:52:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1507,'租户套餐新增','sys_systenantmenu_add',NULL,NULL,1500,'1','1',1,'0',NULL,'1','admin','2022-12-09 14:04:19','admin','2022-12-12 09:02:00','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1508,'租户套餐导出','sys_systenant_export',NULL,NULL,1500,NULL,'1',0,'0','0','1','admin','2023-03-06 16:28:24',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1509,'租户查看','sys_systenant_view',NULL,NULL,1500,NULL,'1',0,'0','0','1','admin','2023-03-06 16:28:24',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1600,'岗位管理',NULL,'/admin/system/post/index',NULL,1000,'iconfont icon-gangweitubiao','1',5,'1','0','0','','2022-03-26 13:04:14','admin','2023-11-01 17:02:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1601,'岗位信息查看','sys_post_view',NULL,NULL,1600,NULL,'1',0,'0',NULL,'1',' ','2022-03-26 13:05:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1602,'岗位信息新增','sys_post_add',NULL,NULL,1600,NULL,'1',1,'0',NULL,'1',' ','2022-03-26 13:06:00',' ',NULL,'0',1);
|
||||
@@ -577,23 +580,29 @@ INSERT INTO `sys_menu` VALUES (2103,'审计日志',NULL,'/admin/audit/index',NUL
|
||||
INSERT INTO `sys_menu` VALUES (2104,'审计记录表删除','sys_audit_del',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:43','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2105,'导入导出','sys_audit_export',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2106,'敏感数据查看','no_mask',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2107,'日志查看','sys_log_view',NULL,NULL,2001,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2108,'日志查看','sys_audit_view',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2200,'字典管理',NULL,'/admin/dict/index',NULL,2000,'iconfont icon-zidianguanli','1',6,'0',NULL,'0','','2017-11-29 11:30:52','admin','2023-02-16 15:24:29','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2201,'字典删除','sys_dict_del',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2017-11-29 11:30:11',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2202,'字典新增','sys_dict_add',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:34:55',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2203,'字典修改','sys_dict_edit',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:36:03',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2204,'字典查看','sys_dict_view',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:36:03',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2210,'参数管理',NULL,'/admin/param/index',NULL,2000,'iconfont icon-canshuguanli','1',7,'1',NULL,'0','','2019-04-29 22:16:50','admin','2023-02-16 15:24:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2211,'参数新增','sys_syspublicparam_add',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:17:36',' ','2020-03-24 08:57:11','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2212,'参数删除','sys_syspublicparam_del',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:17:55',' ','2020-03-24 08:57:12','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2213,'参数编辑','sys_syspublicparam_edit',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:18:14',' ','2020-03-24 08:57:13','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2214,'参数查看','sys_syspublicparam_edit',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:18:14',' ','2020-03-24 08:57:13','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2300,'代码生成',NULL,'/gen/table/index',NULL,9000,'iconfont icon-daimashengcheng','1',2,'0','0','0','','2018-01-20 13:17:19','admin','2023-02-20 13:54:35','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2400,'终端管理',NULL,'/admin/client/index',NULL,2000,'iconfont icon-shouji','1',9,'1',NULL,'0','','2018-01-20 13:17:19','admin','2023-02-16 15:25:28','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2401,'客户端新增','sys_client_add',NULL,NULL,2400,'1','1',1,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2402,'客户端修改','sys_client_edit',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:37:06',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2403,'客户端删除','sys_client_del',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:39:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2404,'客户端查看','sys_client_view',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:39:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2500,'密钥管理',NULL,'/admin/social/index',NULL,2000,'iconfont icon-miyueguanli','1',10,'0',NULL,'0','','2018-01-20 13:17:19','admin','2025-01-26 22:25:20','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2501,'密钥新增','sys_social_details_add',NULL,NULL,2500,'1','1',0,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:19','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2502,'密钥修改','sys_social_details_edit',NULL,NULL,2500,'1','1',1,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:19','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2503,'密钥删除','sys_social_details_del',NULL,NULL,2500,'1','1',2,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:23','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2504,'密钥查看','sys_social_details_view',NULL,NULL,2500,'1','1',2,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:23','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2600,'令牌管理',NULL,'/admin/token/index',NULL,2000,'iconfont icon-lingpai','1',11,'0',NULL,'0','','2018-09-04 05:58:41','admin','2023-02-16 15:28:28','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2601,'令牌删除','sys_token_del',NULL,NULL,2600,NULL,'1',1,'0',NULL,'1',' ','2018-09-04 05:59:50',' ','2020-03-24 08:57:24','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2800,'Quartz管理',NULL,'/tools/job-manage/index',NULL,9910,'iconfont icon-quartz','1',4,'0',NULL,'0','','2018-01-20 13:17:19','admin','2023-11-27 14:52:53','0',1);
|
||||
@@ -613,6 +622,7 @@ INSERT INTO `sys_menu` VALUES (2904,'系统表-国际化删除','sys_i18n_del',N
|
||||
INSERT INTO `sys_menu` VALUES (2905,'导入导出','sys_i18n_export',NULL,NULL,2900,'1','1',3,'0',NULL,'1',' ',NULL,' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2906,'文件管理',NULL,'/admin/file/index',NULL,2000,'iconfont icon-wendangguanli','1',6,'0',NULL,'0','','2019-06-25 12:44:46','admin','2023-02-16 15:24:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2907,'删除文件','sys_file_del',NULL,NULL,2906,NULL,'1',1,'0',NULL,'1',' ','2019-06-25 13:41:41',' ','2020-03-24 08:58:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2908,'查看文件','sys_file_view',NULL,NULL,2906,NULL,'1',1,'0',NULL,'1',' ','2019-06-25 13:41:41',' ','2020-03-24 08:58:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2910,'行政区划','','/admin/sysArea/index',NULL,2000,'iconfont icon-hangzhengquhuaguanli','1',99,'0',NULL,'0','',NULL,'admin','2024-02-16 22:11:03','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2911,'行政区划表查看','sys_sysArea_view',NULL,NULL,2910,'1','1',0,'0',NULL,'1',' ',NULL,' ','2024-02-17 14:31:09','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2912,'行政区划表新增','sys_sysArea_add',NULL,NULL,2910,'1','1',1,'0',NULL,'1',' ',NULL,' ','2024-02-17 14:31:16','0',1);
|
||||
@@ -927,6 +937,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 1101);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1102);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1103);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1104);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1105);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1200);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1201);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1202);
|
||||
@@ -937,6 +948,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 1302);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1303);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1304);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1305);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1306);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1400);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1401);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1402);
|
||||
@@ -951,6 +963,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 1505);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1506);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1507);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1508);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1509);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1600);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1601);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1602);
|
||||
@@ -966,23 +979,29 @@ INSERT INTO `sys_role_menu` VALUES (1, 2103);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2104);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2105);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2106);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2107);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2108);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2200);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2201);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2202);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2203);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2204);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2210);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2211);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2212);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2213);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2214);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2300);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2400);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2401);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2402);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2403);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2404);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2500);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2501);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2502);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2503);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2504);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2600);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2601);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2800);
|
||||
@@ -1002,6 +1021,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 2904);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2905);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2906);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2907);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2908);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2910);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2911);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2912);
|
||||
|
||||
@@ -520,6 +520,7 @@ INSERT INTO `sys_menu` VALUES (1101,'用户新增','sys_user_add',NULL,NULL,1100
|
||||
INSERT INTO `sys_menu` VALUES (1102,'用户修改','sys_user_edit',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:52:48',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1103,'用户删除','sys_user_del',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1104,'导入导出','sys_user_export',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1105,'用户查看','sys_user_view',NULL,NULL,1100,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 09:54:01',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1200,'菜单管理',NULL,'/admin/system/menu/index',NULL,1000,'iconfont icon-caidan','1',2,'0','0','0','','2017-11-08 09:57:27','admin','2023-11-01 16:40:39','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1201,'菜单新增','sys_menu_add',NULL,NULL,1200,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:15:53',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1202,'菜单修改','sys_menu_edit',NULL,NULL,1200,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:16:23',' ','2021-05-25 03:12:55','0',1);
|
||||
@@ -530,6 +531,7 @@ INSERT INTO `sys_menu` VALUES (1302,'角色修改','sys_role_edit',NULL,NULL,130
|
||||
INSERT INTO `sys_menu` VALUES (1303,'角色删除','sys_role_del',NULL,NULL,1300,NULL,'1',1,'0',NULL,'1',' ','2017-11-08 10:14:59',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1304,'分配权限','sys_role_perm',NULL,NULL,1300,NULL,'1',1,'0',NULL,'1',' ','2018-04-20 07:22:55',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1305,'角色导入导出','sys_role_export',NULL,NULL,1300,NULL,'1',4,'0',NULL,'1',' ','2022-03-26 15:54:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1306,'角色查看','sys_role_view',NULL,NULL,1300,NULL,'1',4,'0',NULL,'1',' ','2022-03-26 15:54:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1400,'部门管理',NULL,'/admin/system/dept/index',NULL,1000,'iconfont icon-bumenguanli','1',4,'0',NULL,'0','','2018-01-20 13:17:19','admin','2023-11-01 16:40:30','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1401,'部门新增','sys_dept_add',NULL,NULL,1400,NULL,'1',1,'0',NULL,'1',' ','2018-01-20 14:56:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1402,'部门修改','sys_dept_edit',NULL,NULL,1400,NULL,'1',1,'0',NULL,'1',' ','2018-01-20 14:56:59',' ','2021-05-25 03:12:55','0',1);
|
||||
@@ -544,6 +546,7 @@ INSERT INTO `sys_menu` VALUES (1505,'租户套餐删除','sys_systenantmenu_del'
|
||||
INSERT INTO `sys_menu` VALUES (1506,'租户套餐编辑','sys_systenantmenu_edit',NULL,NULL,1500,'1','1',1,'0',NULL,'1','admin','2022-12-09 14:04:19','admin','2023-01-11 05:52:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1507,'租户套餐新增','sys_systenantmenu_add',NULL,NULL,1500,'1','1',1,'0',NULL,'1','admin','2022-12-09 14:04:19','admin','2022-12-12 09:02:00','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1508,'租户套餐导出','sys_systenant_export',NULL,NULL,1500,NULL,'1',0,'0','0','1','admin','2023-03-06 16:28:24',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1509,'租户查看','sys_systenant_view',NULL,NULL,1500,NULL,'1',0,'0','0','1','admin','2023-03-06 16:28:24',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1600,'岗位管理',NULL,'/admin/system/post/index',NULL,1000,'iconfont icon-gangweitubiao','1',5,'1','0','0','','2022-03-26 13:04:14','admin','2023-11-01 17:02:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1601,'岗位信息查看','sys_post_view',NULL,NULL,1600,NULL,'1',0,'0',NULL,'1',' ','2022-03-26 13:05:34',' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (1602,'岗位信息新增','sys_post_add',NULL,NULL,1600,NULL,'1',1,'0',NULL,'1',' ','2022-03-26 13:06:00',' ',NULL,'0',1);
|
||||
@@ -559,23 +562,29 @@ INSERT INTO `sys_menu` VALUES (2103,'审计日志',NULL,'/admin/audit/index',NUL
|
||||
INSERT INTO `sys_menu` VALUES (2104,'审计记录表删除','sys_audit_del',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:43','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2105,'导入导出','sys_audit_export',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2106,'敏感数据查看','no_mask',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2107,'日志查看','sys_log_view',NULL,NULL,2001,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2108,'日志查看','sys_audit_view',NULL,NULL,2103,'1','1',3,'0',NULL,'1','',NULL,'admin','2023-02-28 20:23:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2200,'字典管理',NULL,'/admin/dict/index',NULL,2000,'iconfont icon-zidianguanli','1',6,'0',NULL,'0','','2017-11-29 11:30:52','admin','2023-02-16 15:24:29','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2201,'字典删除','sys_dict_del',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2017-11-29 11:30:11',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2202,'字典新增','sys_dict_add',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:34:55',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2203,'字典修改','sys_dict_edit',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:36:03',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2204,'字典查看','sys_dict_view',NULL,NULL,2200,NULL,'1',1,'0',NULL,'1',' ','2018-05-11 22:36:03',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2210,'参数管理',NULL,'/admin/param/index',NULL,2000,'iconfont icon-canshuguanli','1',7,'1',NULL,'0','','2019-04-29 22:16:50','admin','2023-02-16 15:24:51','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2211,'参数新增','sys_syspublicparam_add',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:17:36',' ','2020-03-24 08:57:11','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2212,'参数删除','sys_syspublicparam_del',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:17:55',' ','2020-03-24 08:57:12','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2213,'参数编辑','sys_syspublicparam_edit',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:18:14',' ','2020-03-24 08:57:13','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2214,'参数查看','sys_syspublicparam_edit',NULL,NULL,2210,NULL,'1',1,'0',NULL,'1',' ','2019-04-29 22:18:14',' ','2020-03-24 08:57:13','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2300,'代码生成',NULL,'/gen/table/index',NULL,9000,'iconfont icon-daimashengcheng','1',2,'0','0','0','','2018-01-20 13:17:19','admin','2023-02-20 13:54:35','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2400,'终端管理',NULL,'/admin/client/index',NULL,2000,'iconfont icon-shouji','1',9,'1',NULL,'0','','2018-01-20 13:17:19','admin','2023-02-16 15:25:28','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2401,'客户端新增','sys_client_add',NULL,NULL,2400,'1','1',1,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2402,'客户端修改','sys_client_edit',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:37:06',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2403,'客户端删除','sys_client_del',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:39:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2404,'客户端查看','sys_client_view',NULL,NULL,2400,NULL,'1',1,'0',NULL,'1',' ','2018-05-15 21:39:16',' ','2021-05-25 03:12:55','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2500,'密钥管理',NULL,'/admin/social/index',NULL,2000,'iconfont icon-miyueguanli','1',10,'0',NULL,'0','','2018-01-20 13:17:19','admin','2025-01-26 22:25:20','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2501,'密钥新增','sys_social_details_add',NULL,NULL,2500,'1','1',0,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:19','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2502,'密钥修改','sys_social_details_edit',NULL,NULL,2500,'1','1',1,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:19','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2503,'密钥删除','sys_social_details_del',NULL,NULL,2500,'1','1',2,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:23','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2504,'密钥查看','sys_social_details_view',NULL,NULL,2500,'1','1',2,'0',NULL,'1',' ','2018-05-15 21:35:18',' ','2020-03-24 08:57:23','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2600,'令牌管理',NULL,'/admin/token/index',NULL,2000,'iconfont icon-lingpai','1',11,'0',NULL,'0','','2018-09-04 05:58:41','admin','2023-02-16 15:28:28','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2601,'令牌删除','sys_token_del',NULL,NULL,2600,NULL,'1',1,'0',NULL,'1',' ','2018-09-04 05:59:50',' ','2020-03-24 08:57:24','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2800,'Quartz管理',NULL,'/tools/job-manage/index',NULL,9910,'iconfont icon-quartz','1',4,'0',NULL,'0','','2018-01-20 13:17:19','admin','2023-11-27 14:52:53','0',1);
|
||||
@@ -595,6 +604,7 @@ INSERT INTO `sys_menu` VALUES (2904,'系统表-国际化删除','sys_i18n_del',N
|
||||
INSERT INTO `sys_menu` VALUES (2905,'导入导出','sys_i18n_export',NULL,NULL,2900,'1','1',3,'0',NULL,'1',' ',NULL,' ',NULL,'0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2906,'文件管理',NULL,'/admin/file/index',NULL,2000,'iconfont icon-wendangguanli','1',6,'0',NULL,'0','','2019-06-25 12:44:46','admin','2023-02-16 15:24:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2907,'删除文件','sys_file_del',NULL,NULL,2906,NULL,'1',1,'0',NULL,'1',' ','2019-06-25 13:41:41',' ','2020-03-24 08:58:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2908,'查看文件','sys_file_view',NULL,NULL,2906,NULL,'1',1,'0',NULL,'1',' ','2019-06-25 13:41:41',' ','2020-03-24 08:58:42','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2910,'行政区划','','/admin/sysArea/index',NULL,2000,'iconfont icon-hangzhengquhuaguanli','1',99,'0',NULL,'0','',NULL,'admin','2024-02-16 22:11:03','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2911,'行政区划表查看','sys_sysArea_view',NULL,NULL,2910,'1','1',0,'0',NULL,'1',' ',NULL,' ','2024-02-17 14:31:09','0',1);
|
||||
INSERT INTO `sys_menu` VALUES (2912,'行政区划表新增','sys_sysArea_add',NULL,NULL,2910,'1','1',1,'0',NULL,'1',' ',NULL,' ','2024-02-17 14:31:16','0',1);
|
||||
@@ -921,6 +931,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 1302);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1303);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1304);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1305);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1306);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1400);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1401);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1402);
|
||||
@@ -935,6 +946,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 1505);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1506);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1507);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1508);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1509);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1600);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1601);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 1602);
|
||||
@@ -950,23 +962,29 @@ INSERT INTO `sys_role_menu` VALUES (1, 2103);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2104);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2105);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2106);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2107);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2108);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2200);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2201);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2202);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2203);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2204);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2210);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2211);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2212);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2213);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2214);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2300);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2400);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2401);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2402);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2403);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2404);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2500);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2501);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2502);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2503);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2504);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2600);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2601);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2800);
|
||||
@@ -986,6 +1004,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 2904);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2905);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2906);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2907);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2908);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2910);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2911);
|
||||
INSERT INTO `sys_role_menu` VALUES (1, 2912);
|
||||
|
||||
+1
@@ -61,6 +61,7 @@ public class SysAuditLogController {
|
||||
*/
|
||||
@Operation(summary = "分页查询", description = "分页查询")
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_audit_view")
|
||||
public R getsysAuditLogPage(@ParameterObject Page page, @ParameterObject SysAuditLog sysAuditLog) {
|
||||
return R.ok(sysAuditLogService.getAuditsByScope(page, sysAuditLog));
|
||||
}
|
||||
|
||||
+1
@@ -92,6 +92,7 @@ public class SysClientController {
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_client_view")
|
||||
public R getOauthClientDetailsPage(@ParameterObject Page page,
|
||||
@ParameterObject SysOauthClientDetails sysOauthClientDetails) {
|
||||
LambdaQueryWrapper<SysOauthClientDetails> wrapper = Wrappers.<SysOauthClientDetails>lambdaQuery()
|
||||
|
||||
+1
@@ -92,6 +92,7 @@ public class SysDictController {
|
||||
* @return 分页对象
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_dict_view")
|
||||
public R<IPage> getDictPage(@ParameterObject Page page, @ParameterObject SysDict sysDict) {
|
||||
return R.ok(sysDictService.page(page,
|
||||
Wrappers.<SysDict>lambdaQuery()
|
||||
|
||||
+1
@@ -69,6 +69,7 @@ public class SysFileController {
|
||||
*/
|
||||
@Operation(summary = "分页查询", description = "分页查询")
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_file_view")
|
||||
public R getSysFilePage(@ParameterObject Page page, @ParameterObject SysFile sysFile) {
|
||||
LambdaQueryWrapper<SysFile> wrapper = Wrappers.<SysFile>lambdaQuery()
|
||||
.eq(StrUtil.isNotBlank(sysFile.getType()), SysFile::getType, sysFile.getType())
|
||||
|
||||
+1
@@ -65,6 +65,7 @@ public class SysLogController {
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_log_view")
|
||||
public R getLogPage(@ParameterObject Page page, @ParameterObject SysLogDTO sysLog) {
|
||||
return R.ok(sysLogService.getLogByPage(page, sysLog));
|
||||
}
|
||||
|
||||
+3
-2
@@ -87,6 +87,7 @@ public class SysPublicParamController {
|
||||
*/
|
||||
@Operation(description = "分页查询", summary = "分页查询")
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_syspublicparam_view")
|
||||
public R getSysPublicParamPage(@ParameterObject Page page, @ParameterObject SysPublicParam sysPublicParam) {
|
||||
LambdaUpdateWrapper<SysPublicParam> wrapper = Wrappers.<SysPublicParam>lambdaUpdate()
|
||||
.like(StrUtil.isNotBlank(sysPublicParam.getPublicName()), SysPublicParam::getPublicName,
|
||||
@@ -162,8 +163,8 @@ public class SysPublicParamController {
|
||||
@GetMapping("/export")
|
||||
@HasPermission("sys_syspublicparam_edit")
|
||||
public List<SysPublicParam> export(SysPublicParam param, Long[] ids) {
|
||||
return sysPublicParamService.list(Wrappers.lambdaQuery(param)
|
||||
.in(ArrayUtil.isNotEmpty(ids), SysPublicParam::getPublicId, CollUtil.toList(ids)));
|
||||
return sysPublicParamService.list(Wrappers.lambdaQuery(param)
|
||||
.in(ArrayUtil.isNotEmpty(ids), SysPublicParam::getPublicId, CollUtil.toList(ids)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
@@ -133,6 +133,7 @@ public class SysRoleController {
|
||||
* @return 分页对象
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_role_view")
|
||||
public R getRolePage(Page page, SysRole role) {
|
||||
return R.ok(sysRoleService.page(page, Wrappers.<SysRole>lambdaQuery()
|
||||
.like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())));
|
||||
|
||||
+1
@@ -61,6 +61,7 @@ public class SysSocialDetailsController {
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_social_details_view")
|
||||
public R getSocialDetailsPage(@ParameterObject Page page, @ParameterObject SysSocialDetails sysSocialDetails) {
|
||||
return R.ok(sysSocialDetailsService.page(page, Wrappers.query(sysSocialDetails)));
|
||||
}
|
||||
|
||||
+11
-21
@@ -68,42 +68,41 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @param page 分页对象
|
||||
* @param page 分页对象
|
||||
* @param sysTenant 租户
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_systenant_view")
|
||||
public R getSysTenantPage(@ParameterObject Page page, @ParameterObject SysTenant sysTenant) {
|
||||
return R.ok(sysTenantService.page(page, Wrappers.<SysTenant>lambdaQuery()
|
||||
.like(StrUtil.isNotBlank(sysTenant.getName()), SysTenant::getName, sysTenant.getName())));
|
||||
.like(StrUtil.isNotBlank(sysTenant.getName()), SysTenant::getName, sysTenant.getName())));
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过ID 查询租户信息
|
||||
*
|
||||
* @param id ID
|
||||
* @return R
|
||||
*/
|
||||
@GetMapping("/details/{id}")
|
||||
@HasPermission("sys_systenant_view")
|
||||
public R getById(@PathVariable Long id) {
|
||||
return R.ok(sysTenantService.getById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询租户信息
|
||||
*
|
||||
* @param query 查询条件
|
||||
* @return 租户信息
|
||||
*/
|
||||
@GetMapping("/details")
|
||||
@HasPermission("sys_systenant_view")
|
||||
public R getDetails(@ParameterObject SysTenant query) {
|
||||
return R.ok(sysTenantService.getOne(Wrappers.query(query), false));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增租户
|
||||
*
|
||||
* @param sysTenant 租户
|
||||
* @return R
|
||||
*/
|
||||
@@ -117,7 +116,6 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 修改租户
|
||||
*
|
||||
* @param sysTenant 租户
|
||||
* @return R
|
||||
*/
|
||||
@@ -132,7 +130,6 @@ public class SysTenantController {
|
||||
* 通过id删除租户
|
||||
* <p>
|
||||
* 为了保证安全,这里只删除租户表的数据，不删除基础表中的租户初始化数据。
|
||||
*
|
||||
* @param ids id 列表
|
||||
* @return R
|
||||
*/
|
||||
@@ -145,25 +142,23 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 查询全部有效的租户列表
|
||||
*
|
||||
* @return 包含有效租户列表的响应结果
|
||||
*/
|
||||
@Inner(value = false)
|
||||
@GetMapping("/list")
|
||||
public R list() {
|
||||
List<SysTenant> tenants = sysTenantService.getNormalTenant()
|
||||
.stream()
|
||||
.filter(tenant -> tenant.getStartTime().isBefore(LocalDateTime.now()))
|
||||
.filter(tenant -> tenant.getEndTime().isAfter(LocalDateTime.now()))
|
||||
.toList();
|
||||
.stream()
|
||||
.filter(tenant -> tenant.getStartTime().isBefore(LocalDateTime.now()))
|
||||
.filter(tenant -> tenant.getEndTime().isAfter(LocalDateTime.now()))
|
||||
.toList();
|
||||
return R.ok(tenants);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出租户信息到Excel
|
||||
*
|
||||
* @param sysTenant 租户查询条件
|
||||
* @param ids 租户ID数组
|
||||
* @param ids 租户ID数组
|
||||
* @return 符合条件的租户列表
|
||||
*/
|
||||
@ResponseExcel
|
||||
@@ -176,7 +171,6 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 获取租户菜单
|
||||
*
|
||||
* @return 包含菜单树结构的响应结果
|
||||
*/
|
||||
@GetMapping(value = "/tree/menu")
|
||||
@@ -192,7 +186,6 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 获取用户租户信息
|
||||
*
|
||||
* @return 包含用户租户信息的响应结果
|
||||
*/
|
||||
@GetMapping("/user-tenant")
|
||||
@@ -202,7 +195,6 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 新增用户租户关联关系
|
||||
*
|
||||
* @param tenantUserDTO 用户租户关联信息DTO
|
||||
* @return 操作结果
|
||||
*/
|
||||
@@ -214,8 +206,7 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 获取用户租户分页信息
|
||||
*
|
||||
* @param page 分页参数
|
||||
* @param page 分页参数
|
||||
* @param userDTO 用户查询参数
|
||||
* @return 租户分页结果
|
||||
*/
|
||||
@@ -261,7 +252,6 @@ public class SysTenantController {
|
||||
|
||||
/**
|
||||
* 更新用户租户信息
|
||||
*
|
||||
* @param userDto 用户数据传输对象，包含需要更新的用户信息
|
||||
* @return 操作结果
|
||||
*/
|
||||
|
||||
+1
@@ -147,6 +147,7 @@ public class SysUserController {
|
||||
* @return 用户集合
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
@HasPermission("sys_user_view")
|
||||
public R getUserPage(@ParameterObject Page page, @ParameterObject UserDTO userDTO) {
|
||||
return R.ok(userService.getUsersWithRolePage(page, userDTO));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user