权限管理-报表权限修改

This commit is contained in:
liuzhaotian
2025-03-12 15:31:44 +08:00
parent 96a6264089
commit 0a6c62dc5a
3 changed files with 12 additions and 12 deletions
@@ -40,7 +40,7 @@ public class ReportDatasetController {
@PutMapping("/dataset") @PutMapping("/dataset")
@Operation(summary = "创建报表数据集") @Operation(summary = "创建报表数据集")
@OperateLog(type = CREATE) @OperateLog(type = CREATE)
@PreAuthorize("@ss.hasPermission('report:design')") @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')")
public CommonResult<Long> createDataset(@Valid @RequestBody ReportDatasetSaveReqVO createReqVO) { public CommonResult<Long> createDataset(@Valid @RequestBody ReportDatasetSaveReqVO createReqVO) {
return success(datasetService.createDataset(createReqVO)); return success(datasetService.createDataset(createReqVO));
} }
@@ -48,7 +48,7 @@ public class ReportDatasetController {
@PostMapping("/dataset") @PostMapping("/dataset")
@Operation(summary = "更新报表数据集") @Operation(summary = "更新报表数据集")
@OperateLog(type = UPDATE) @OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('report:design')") @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')")
public CommonResult<Boolean> updateDataset(@Valid @RequestBody ReportDatasetSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDataset(@Valid @RequestBody ReportDatasetSaveReqVO updateReqVO) {
datasetService.updateDataset(updateReqVO); datasetService.updateDataset(updateReqVO);
return success(true); return success(true);
@@ -57,7 +57,7 @@ public class ReportDatasetController {
@DeleteMapping("/dataset/{id}") @DeleteMapping("/dataset/{id}")
@Operation(summary = "删除报表数据集") @Operation(summary = "删除报表数据集")
@Parameter(name = "id", description = "数据集id", required = true) @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<Boolean> deleteDataset(@PathVariable("id") Long id) { public CommonResult<Boolean> deleteDataset(@PathVariable("id") Long id) {
datasetService.deleteDataset(id); datasetService.deleteDataset(id);
return success(true); return success(true);
@@ -55,7 +55,7 @@ public class ReportDatasourceController {
@PutMapping("/datasource") @PutMapping("/datasource")
@Operation(summary = "创建报表数据源") @Operation(summary = "创建报表数据源")
@OperateLog(type = CREATE) @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<Long> createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) { public CommonResult<Long> createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) {
return success(datasourceService.createDatasource(createReqVO)); return success(datasourceService.createDatasource(createReqVO));
} }
@@ -63,7 +63,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource") @PostMapping("/datasource")
@Operation(summary = "更新报表数据源") @Operation(summary = "更新报表数据源")
@OperateLog(type = UPDATE) @OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('report:design')") @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')")
public CommonResult<Boolean> updateDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO updateReqVO) { public CommonResult<Boolean> updateDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO updateReqVO) {
datasourceService.updateDatasource(updateReqVO); datasourceService.updateDatasource(updateReqVO);
return success(true); return success(true);
@@ -72,7 +72,7 @@ public class ReportDatasourceController {
@DeleteMapping("/datasource/{id}") @DeleteMapping("/datasource/{id}")
@Operation(summary = "删除报表数据源") @Operation(summary = "删除报表数据源")
@Parameter(name = "id", description = "数据源id", required = true, example = "1") @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<Boolean> deleteDatasource(@PathVariable("id") Long id) { public CommonResult<Boolean> deleteDatasource(@PathVariable("id") Long id) {
datasourceService.deleteDatasource(id); datasourceService.deleteDatasource(id);
return success(true); return success(true);
@@ -120,7 +120,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource/connect") @PostMapping("/datasource/connect")
@Operation(summary = "测试数据源连接") @Operation(summary = "测试数据源连接")
@PreAuthorize("@ss.hasPermission('report:design')") @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','base:report:datasource-connect')")
public CommonResult<Boolean> testDatasourceConnect(@RequestBody @Valid ReportDatasourceTestConnReqVO reqVO) { public CommonResult<Boolean> testDatasourceConnect(@RequestBody @Valid ReportDatasourceTestConnReqVO reqVO) {
String success = MultipleJdbcTemplate.testConnection(BeanUtils.toBean(reqVO, DataSourceInfo.class)); String success = MultipleJdbcTemplate.testConnection(BeanUtils.toBean(reqVO, DataSourceInfo.class));
return Objects.equals("success", success) ? success(true) : error(DATASOURCE_CONNECT_FAIL); return Objects.equals("success", success) ? success(true) : error(DATASOURCE_CONNECT_FAIL);
@@ -110,7 +110,7 @@ public class ReportTemplateController {
@PostMapping("/template/preview") @PostMapping("/template/preview")
@Operation(summary = "模板预览") @Operation(summary = "模板预览")
@OperateLog(enable = false) @OperateLog(enable = false)
@PreAuthorize("@ss.hasPermission('report:preview')") @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')")
public CommonResult<HtmlReport> preview(@RequestBody ReportTemplatePreviewReqVO reqVO) { public CommonResult<HtmlReport> preview(@RequestBody ReportTemplatePreviewReqVO reqVO) {
return success(templateService.preview(reqVO)); return success(templateService.preview(reqVO));
} }
@@ -124,28 +124,28 @@ public class ReportTemplateController {
@PostMapping("/template/print") @PostMapping("/template/print")
@Operation(summary = "模板预览打印") @Operation(summary = "模板预览打印")
@PreAuthorize("@ss.hasPermission('report:preview')") @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')")
public void print(@RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) { public void print(@RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) {
templateService.print(reqVO, response); templateService.print(reqVO, response);
} }
@PostMapping("/template/print/common") @PostMapping("/template/print/common")
@Operation(summary = "模板预览打印") @Operation(summary = "模板预览打印")
@PreAuthorize("@ss.hasPermission('report:preview')") @PreAuthorize("@ss.hasAnyPermissions('system:report:preview','base:report:preview')")
public void commonPrint(@RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) { public void commonPrint(@RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) {
templateService.commonPrint(reqVO, response); templateService.commonPrint(reqVO, response);
} }
@PostMapping("/template/download/{type}") @PostMapping("/template/download/{type}")
@Operation(summary = "模板预览下载") @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) { public void print(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) {
templateService.download(type, reqVO, response); templateService.download(type, reqVO, response);
} }
@PostMapping("/template/download/{type}/common") @PostMapping("/template/download/{type}/common")
@Operation(summary = "模板预览下载") @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) { public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) {
templateService.commonDownload(type, reqVO, response); templateService.commonDownload(type, reqVO, response);
} }