From 79e738d704f8acb75e8f36914a8da7a705bf351f Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 23 Apr 2022 16:11:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/validatorRulesTemplate/core.ftl | 99 +++++++++---------- .../vue/modules/${entityName}Form.vuei | 2 +- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl index ba233e33..38e4fc58 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl @@ -1,58 +1,57 @@ <#include "../utils.ftl"> <#if po.isShow == 'Y' && poHasCheck(po)> <#if po.fieldName != 'id'> - ${po.fieldName}: [ + ${po.fieldName}: [ <#assign fieldValidType = po.fieldValidType!''> <#-- 非空校验 --> - <#if po.nullable == 'N' || fieldValidType == '*'> - { required: true, message: '请输入${po.filedComment}!'}, - <#elseif fieldValidType!=''> - { required: false}, - + <#if po.nullable == 'N' || fieldValidType == '*'> + { required: true, message: '请输入${po.filedComment}!'}, + <#elseif fieldValidType!=''> + { required: false}, + <#-- 唯一校验 --> - <#if fieldValidType == 'only'> - { validator: (rule, value, callback) => validateDuplicateValue(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}', '${po.fieldDbName}', value, this.model.id, callback)}, - <#-- 6到16位数字 --> - <#elseif fieldValidType == 'n6-16'> - { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'}, - <#-- 6到16位任意字符 --> - <#elseif fieldValidType == '*6-16'> - { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'}, - <#-- 6到18位字符串 --> - <#elseif fieldValidType == 's6-18'> - { pattern: /^.{6,18}$/, message: '请输入6到18位任意字符!'}, - <#-- 网址 --> - <#elseif fieldValidType == 'url'> - { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'}, - <#-- 电子邮件 --> - <#elseif fieldValidType == 'e'> - { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'}, - <#-- 手机号码 --> - <#elseif fieldValidType == 'm'> - { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, - <#-- 邮政编码 --> - <#elseif fieldValidType == 'p'> - { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, - <#-- 字母 --> - <#elseif fieldValidType == 's'> - { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'}, - <#-- 数字 --> - <#elseif fieldValidType == 'n'> - { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'}, - <#-- 整数 --> - <#elseif fieldValidType == 'z'> - { pattern: /^-?\d+$/, message: '请输入整数!'}, - <#-- 金额 --> - <#elseif fieldValidType == 'money'> - { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'}, - <#-- 正则校验 --> - <#elseif fieldValidType != '' && fieldValidType != '*'> - { pattern: '${fieldValidType}', message: '不符合校验规则!'}, - <#-- 无校验 --> - <#else> - <#t> + <#if fieldValidType == 'only'> + { validator: (rule, value, callback) => validateDuplicateValue(<#if sub?default("")?trim?length gt 1>'${sub.tableName}'<#else>'${tableName}', '${po.fieldDbName}', value, this.model.id, callback)}, + <#-- 6到16位数字 --> + <#elseif fieldValidType == 'n6-16'> + { pattern: /^\d{6,16}$/, message: '请输入6到16位数字!'}, + <#-- 6到16位任意字符 --> + <#elseif fieldValidType == '*6-16'> + { pattern: /^.{6,16}$/, message: '请输入6到16位任意字符!'}, + <#-- 6到18位字符串 --> + <#elseif fieldValidType == 's6-18'> + { pattern: /^.{6,18}$/, message: '请输入6到18位任意字符!'}, + <#-- 网址 --> + <#elseif fieldValidType == 'url'> + { pattern: /^((ht|f)tps?):\/\/[\w\-]+(\.[\w\-]+)+([\w\-.,@?^=%&:\/~+#]*[\w\-@?^=%&\/~+#])?$/, message: '请输入正确的网址!'}, + <#-- 电子邮件 --> + <#elseif fieldValidType == 'e'> + { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'}, + <#-- 手机号码 --> + <#elseif fieldValidType == 'm'> + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + <#-- 邮政编码 --> + <#elseif fieldValidType == 'p'> + { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'}, + <#-- 字母 --> + <#elseif fieldValidType == 's'> + { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'}, + <#-- 数字 --> + <#elseif fieldValidType == 'n'> + { pattern: /^-?\d+\.?\d*$/, message: '请输入数字!'}, + <#-- 整数 --> + <#elseif fieldValidType == 'z'> + { pattern: /^-?\d+$/, message: '请输入整数!'}, + <#-- 金额 --> + <#elseif fieldValidType == 'money'> + { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'}, + <#-- 正则校验 --> + <#elseif fieldValidType != '' && fieldValidType != '*'> + { pattern: '${fieldValidType}', message: '不符合校验规则!'}, + <#-- 无校验 --> + <#else> + <#t> + + ], - ] - }, - \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei index 5ea45c5e..cc487c61 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei @@ -152,7 +152,7 @@ return { model:{ <#include "/common/init/initValue.ftl"> - }, + }, labelCol: { xs: { span: 24 }, sm: { span: 5 }, From 65964f05722147e2bc49d7677f1ea8a2436c38aa Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 23 Apr 2022 17:10:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91JUpload?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8F=90=E4=BE=9B=E4=B8=8B=E8=BD=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/jero/JUpload.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jero-web/src/components/jero/JUpload.vue b/jero-web/src/components/jero/JUpload.vue index c6778881..42fe27fd 100644 --- a/jero-web/src/components/jero/JUpload.vue +++ b/jero-web/src/components/jero/JUpload.vue @@ -13,6 +13,10 @@ :returnUrl="returnUrl" :listType="complistType" @preview="handlePreview" + @download="handleDownload" + :showUploadList="{ + showDownloadIcon: isDownload + }" v-bind="$attrs" v-on="childListeners" :class="{'uploadty-disabled':disabled}"> @@ -114,6 +118,10 @@ beforeUpload: { type: Function }, + isDownload: { + type: Boolean, + default: true + } }, watch:{ value:{ @@ -283,6 +291,12 @@ window.open(url) } }, + handleDownload(file) { + if (file && file.url) { + var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + window.open(fileFullUrl) + } + } }, mounted(){}, model: { From da49a1bb58a7b4b31547c012e0404082c5c4ab90 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Sun, 24 Apr 2022 17:49:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsys:category:list?= =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/jeroboot-mysql-5.7-20220417.sql | 2 +- jero-boot/db/jeroboot-oracle11g.sql | 2 +- jero-boot/db/jeroboot-sqlserver2017.sql | 2 +- .../controller/SysCategoryController.java | 18 +++--------------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/jero-boot/db/jeroboot-mysql-5.7-20220417.sql b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql index 0906799f..58f2094d 100644 --- a/jero-boot/db/jeroboot-mysql-5.7-20220417.sql +++ b/jero-boot/db/jeroboot-mysql-5.7-20220417.sql @@ -1601,7 +1601,7 @@ INSERT INTO `sys_permission` VALUES ('e3c13679c73a4f829bcff2aba8fd68b1', '2a470f INSERT INTO `sys_permission` VALUES ('e41b69c57a941a3bbcce45032fe57605', '', '开发工具', '/online', 'layouts/RouteView', null, null, '0', null, null, '18.00', '0', 'cloud', '1', '0', '0', '0', null, 'admin', '2019-03-08 10:43:10', 'admin', '2021-03-16 22:31:28', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('e5973686ed495c379d829ea8b2881fc6', 'e3c13679c73a4f829bcff2aba8fd68b1', '高级表单', '/form/advanced-form', 'demo/form/advancedForm/AdvancedForm', null, null, '1', null, null, '3.00', null, null, '1', '1', null, null, null, null, '2018-12-25 20:34:38', null, null, '0', '0', null, null); INSERT INTO `sys_permission` VALUES ('e6bfd1fcabfd7942fdd05f076d1dad38', '2a470fc0c3954d9dbb61de6d80846549', '打印测试', '/demo/PrintDemo', 'demo/PrintDemo', null, null, '1', null, null, '3.00', '0', null, '1', '1', null, '0', null, 'admin', '2019-02-19 15:58:48', 'admin', '2019-05-07 20:14:39', '0', '0', null, null); -INSERT INTO `sys_permission` VALUES ('ebb9d82ea16ad864071158e0c449d186', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '分类字典', '/isys/category', 'system/SysCategoryList', null, null, '1', 'sys:category:list', '1', '5.20', '0', null, '1', '0', '0', '0', null, 'admin', '2019-05-29 18:48:07', 'admin', '2020-02-23 22:45:33', '0', '0', '1', '0'); +INSERT INTO `sys_permission` VALUES ('ebb9d82ea16ad864071158e0c449d186', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '分类字典', '/isys/category', 'system/SysCategoryList', null, null, '1', null, '1', '5.20', '0', null, '1', '0', '0', '0', null, 'admin', '2019-05-29 18:48:07', 'admin', '2020-02-23 22:45:33', '0', '0', '1', '0'); INSERT INTO `sys_permission` VALUES ('ec8d607d0156e198b11853760319c646', '6e73eb3c26099c191bf03852ee1310a1', '安全设置', '/account/settings/security', 'account/settings/Security', null, null, '1', 'SecuritySettings', null, null, null, null, '1', '1', null, null, null, null, '2018-12-26 18:59:52', null, null, '0', '0', null, null); INSERT INTO `sys_permission` VALUES ('f0675b52d89100ee88472b6800754a08', '1371830841603710977', '统计报表', '/report', 'layouts/RouteView', null, null, '1', null, null, '1.00', '0', 'bar-chart', '1', '0', '0', '0', null, 'admin', '2019-04-03 18:32:02', 'admin', '2021-03-16 22:29:03', '0', '0', null, '0'); INSERT INTO `sys_permission` VALUES ('f1cb187abf927c88b89470d08615f5ac', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '数据字典', '/isystem/dict', 'system/DictList', null, null, '1', 'sys:dict:list', '1', '5.00', '0', null, '1', '0', '0', '0', null, null, '2018-12-28 13:54:43', 'admin', '2020-02-23 22:45:25', '0', '0', '1', '0'); diff --git a/jero-boot/db/jeroboot-oracle11g.sql b/jero-boot/db/jeroboot-oracle11g.sql index 00555aa7..ea4ecb97 100644 --- a/jero-boot/db/jeroboot-oracle11g.sql +++ b/jero-boot/db/jeroboot-oracle11g.sql @@ -2003,7 +2003,7 @@ INSERT INTO "SYS_PERMISSION" VALUES ('e3c13679c73a4f829bcff2aba8fd68b1', '2a470f INSERT INTO "SYS_PERMISSION" VALUES ('e41b69c57a941a3bbcce45032fe57605', null, '开发工具', '/online', 'layouts/RouteView', null, null, '0', null, null, '18', '0', 'cloud', '1', '0', '0', '0', null, 'admin', TO_DATE('2019-03-08 10:43:10', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:31:28', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); INSERT INTO "SYS_PERMISSION" VALUES ('e5973686ed495c379d829ea8b2881fc6', 'e3c13679c73a4f829bcff2aba8fd68b1', '高级表单', '/form/advanced-form', 'demo/form/advancedForm/AdvancedForm', null, null, '1', null, null, '3', null, null, '1', '1', null, null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); INSERT INTO "SYS_PERMISSION" VALUES ('e6bfd1fcabfd7942fdd05f076d1dad38', '2a470fc0c3954d9dbb61de6d80846549', '打印测试', '/demo/PrintDemo', 'demo/PrintDemo', null, null, '1', null, null, '3', '0', null, '1', '1', null, '0', null, 'admin', TO_DATE('2019-02-19 15:58:48', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-07 20:14:39', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, null); -INSERT INTO "SYS_PERMISSION" VALUES ('ebb9d82ea16ad864071158e0c449d186', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '分类字典', '/isys/category', 'system/SysCategoryList', null, null, '1', 'sys:category:list', '1', '5.20', '0', null, '1', '0', '0', '0', null, 'admin', TO_DATE('2019-05-29 18:48:07', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-02-23 22:45:33', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1', '0'); +INSERT INTO "SYS_PERMISSION" VALUES ('ebb9d82ea16ad864071158e0c449d186', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '分类字典', '/isys/category', 'system/SysCategoryList', null, null, '1', null, '1', '5.20', '0', null, '1', '0', '0', '0', null, 'admin', TO_DATE('2019-05-29 18:48:07', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-02-23 22:45:33', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1', '0'); INSERT INTO "SYS_PERMISSION" VALUES ('ec8d607d0156e198b11853760319c646', '6e73eb3c26099c191bf03852ee1310a1', '安全设置', '/account/settings/security', 'account/settings/Security', null, null, '1', 'SecuritySettings', null, null, null, null, '1', '1', null, null, null, null, TO_DATE('2018-12-26 18:59:52', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null, null); INSERT INTO "SYS_PERMISSION" VALUES ('f0675b52d89100ee88472b6800754a08', '1371830841603710977', '统计报表', '/report', 'layouts/RouteView', null, null, '1', null, null, '1', '0', 'bar-chart', '1', '0', '0', '0', null, 'admin', TO_DATE('2019-04-03 18:32:02', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-03-16 22:29:03', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null, '0'); INSERT INTO "SYS_PERMISSION" VALUES ('f1cb187abf927c88b89470d08615f5ac', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '数据字典', '/isystem/dict', 'system/DictList', null, null, '1', 'sys:dict:list', null, '5', '0', null, '1', '0', '0', '0', null, null, TO_DATE('2018-12-28 13:54:43', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-02-23 22:45:25', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', '1', '0'); diff --git a/jero-boot/db/jeroboot-sqlserver2017.sql b/jero-boot/db/jeroboot-sqlserver2017.sql index 13a4062c..bc8e3c4c 100644 --- a/jero-boot/db/jeroboot-sqlserver2017.sql +++ b/jero-boot/db/jeroboot-sqlserver2017.sql @@ -5636,7 +5636,7 @@ GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'e6bfd1fcabfd7942fdd05f076d1dad38', N'2a470fc0c3954d9dbb61de6d80846549', N'打印测试', N'/demo/PrintDemo', N'demo/PrintDemo', NULL, NULL, N'1', NULL, NULL, N'3', N'0', NULL, N'1', N'1', NULL, N'0', NULL, N'admin', N'2019-02-19 15:58:48.0000000', N'admin', N'2019-05-07 20:14:39.0000000', N'0', N'0', NULL, NULL) GO -INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'ebb9d82ea16ad864071158e0c449d186', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'分类字典', N'/isys/category', N'system/SysCategoryList', NULL, NULL, N'1', N'sys:category:list', N'1', N'5.2', N'0', NULL, N'1', N'0', N'0', N'0', NULL, N'admin', N'2019-05-29 18:48:07.0000000', N'admin', N'2020-02-23 22:45:33.0000000', N'0', N'0', N'1', N'0') +INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'ebb9d82ea16ad864071158e0c449d186', N'd7d6e2e4e2934f2c9385a623fd98c6f3', N'分类字典', N'/isys/category', N'system/SysCategoryList', NULL, NULL, N'1', NULL, N'1', N'5.2', N'0', NULL, N'1', N'0', N'0', N'0', NULL, N'admin', N'2019-05-29 18:48:07.0000000', N'admin', N'2020-02-23 22:45:33.0000000', N'0', N'0', N'1', N'0') GO INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'ec8d607d0156e198b11853760319c646', N'6e73eb3c26099c191bf03852ee1310a1', N'安全设置', N'/account/settings/security', N'account/settings/Security', NULL, NULL, N'1', N'SecuritySettings', NULL, NULL, NULL, NULL, N'1', N'1', NULL, NULL, NULL, NULL, N'2018-12-26 18:59:52.0000000', NULL, NULL, N'0', N'0', NULL, NULL) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index bd94e192..766a40a7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -55,7 +55,6 @@ public class SysCategoryController { * @param req * @return */ - @RequiresPermissions("sys:category:list") @GetMapping(value = "/rootList") public Result> queryPageList(SysCategory sysCategory, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -79,7 +78,6 @@ public class SysCategoryController { return result; } - @RequiresPermissions("sys:category:list") @GetMapping(value = "/childList") public Result> queryPageList(SysCategory sysCategory,HttpServletRequest req) { Result> result = new Result>(); @@ -130,7 +128,7 @@ public class SysCategoryController { * @param id * @return */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:del") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); @@ -163,7 +161,7 @@ public class SysCategoryController { * @param id * @return */ - @RequiresPermissions("sys:category:list") + @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); @@ -262,7 +260,6 @@ public class SysCategoryController { /** * 加载单个数据 用于回显 */ - @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadOne", method = RequestMethod.GET) public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { try { @@ -286,7 +283,6 @@ public class SysCategoryController { /** * 加载节点的子数据 */ - @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET) public Result> loadTreeChildren(@RequestParam(name="pid") String pid) { Result> result = new Result>(); @@ -305,7 +301,6 @@ public class SysCategoryController { /** * 加载一级节点/如果是同步 则所有数据 */ - @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) public Result> loadTreeRoot(@RequestParam(name="async") Boolean async,@RequestParam(name="pcode") String pcode) { Result> result = new Result>(); @@ -324,10 +319,7 @@ public class SysCategoryController { return result; } - /** - * 递归求子节点 同步加载用到 - */ - @RequiresPermissions("sys:category:list") + private void loadAllCategoryChildren(List ls) { for (TreeSelectModel tsm : ls) { List temp = this.sysCategoryService.queryListByPid(tsm.getKey()); @@ -344,7 +336,6 @@ public class SysCategoryController { * @param code * @return */ - @RequiresPermissions("sys:category:list") @GetMapping(value = "/checkCode") public Result checkCode(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="code",required = false) String code) { if(oConvertUtils.isEmpty(code)){ @@ -370,7 +361,6 @@ public class SysCategoryController { * @param condition * @return */ - @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadTreeData", method = RequestMethod.GET) public Result> loadDict(@RequestParam(name="pid",required = false) String pid,@RequestParam(name="pcode",required = false) String pcode, @RequestParam(name="condition",required = false) String condition) { Result> result = new Result>(); @@ -431,7 +421,6 @@ public class SysCategoryController { * @param code * @return */ - @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadAllData", method = RequestMethod.GET) public Result> loadAllData(@RequestParam(name="code",required = true) String code) { Result> result = new Result>(); @@ -459,7 +448,6 @@ public class SysCategoryController { * @param parentIds * @return */ - @RequiresPermissions("sys:category:list") @GetMapping("/getChildListBatch") public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { try {