From 0a6c62dc5a1bf76508c30f8fb89703252ee2aa2a Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 12 Mar 2025 15:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dataset/ReportDatasetController.java | 6 +++--- .../admin/datasource/ReportDatasourceController.java | 8 ++++---- .../admin/template/ReportTemplateController.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java index 978e46abf..211f87427 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java @@ -40,7 +40,7 @@ public class ReportDatasetController { @PutMapping("/dataset") @Operation(summary = "创建报表数据集") @OperateLog(type = CREATE) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult createDataset(@Valid @RequestBody ReportDatasetSaveReqVO createReqVO) { return success(datasetService.createDataset(createReqVO)); } @@ -48,7 +48,7 @@ public class ReportDatasetController { @PostMapping("/dataset") @Operation(summary = "更新报表数据集") @OperateLog(type = UPDATE) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult updateDataset(@Valid @RequestBody ReportDatasetSaveReqVO updateReqVO) { datasetService.updateDataset(updateReqVO); return success(true); @@ -57,7 +57,7 @@ public class ReportDatasetController { @DeleteMapping("/dataset/{id}") @Operation(summary = "删除报表数据集") @Parameter(name = "id", description = "数据集id", required = true) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult deleteDataset(@PathVariable("id") Long id) { datasetService.deleteDataset(id); return success(true); diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java index b376dfee4..ef6271c68 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java @@ -55,7 +55,7 @@ public class ReportDatasourceController { @PutMapping("/datasource") @Operation(summary = "创建报表数据源") @OperateLog(type = CREATE) - @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','system:report:datasource-connect')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) { return success(datasourceService.createDatasource(createReqVO)); } @@ -63,7 +63,7 @@ public class ReportDatasourceController { @PostMapping("/datasource") @Operation(summary = "更新报表数据源") @OperateLog(type = UPDATE) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult updateDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO updateReqVO) { datasourceService.updateDatasource(updateReqVO); return success(true); @@ -72,7 +72,7 @@ public class ReportDatasourceController { @DeleteMapping("/datasource/{id}") @Operation(summary = "删除报表数据源") @Parameter(name = "id", description = "数据源id", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult deleteDatasource(@PathVariable("id") Long id) { datasourceService.deleteDatasource(id); return success(true); @@ -120,7 +120,7 @@ public class ReportDatasourceController { @PostMapping("/datasource/connect") @Operation(summary = "测试数据源连接") - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')") public CommonResult testDatasourceConnect(@RequestBody @Valid ReportDatasourceTestConnReqVO reqVO) { String success = MultipleJdbcTemplate.testConnection(BeanUtils.toBean(reqVO, DataSourceInfo.class)); return Objects.equals("success", success) ? success(true) : error(DATASOURCE_CONNECT_FAIL); diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java index f41607ed9..a9f02a35d 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java @@ -110,7 +110,7 @@ public class ReportTemplateController { @PostMapping("/template/preview") @Operation(summary = "模板预览") @OperateLog(enable = false) - @PreAuthorize("@ss.hasPermission('report:preview')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')") public CommonResult preview(@RequestBody ReportTemplatePreviewReqVO reqVO) { return success(templateService.preview(reqVO)); } @@ -124,28 +124,28 @@ public class ReportTemplateController { @PostMapping("/template/print") @Operation(summary = "模板预览打印") - @PreAuthorize("@ss.hasPermission('report:preview')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')") public void print(@RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) { templateService.print(reqVO, response); } @PostMapping("/template/print/common") @Operation(summary = "模板预览打印") - @PreAuthorize("@ss.hasPermission('report:preview')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')") public void commonPrint(@RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) { templateService.commonPrint(reqVO, response); } @PostMapping("/template/download/{type}") @Operation(summary = "模板预览下载") - @PreAuthorize("@ss.hasPermission('report:preview')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')") public void print(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) { templateService.download(type, reqVO, response); } @PostMapping("/template/download/{type}/common") @Operation(summary = "模板预览下载") - @PreAuthorize("@ss.hasPermission('report:preview')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')") public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) { templateService.commonDownload(type, reqVO, response); }