diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java index 1ab3269e8..569772bc4 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/exception/enums/GlobalErrorCodeConstants.java @@ -36,7 +36,7 @@ public class GlobalErrorCodeConstants { // ES文档刷新失败 public static final ErrorCode ES_DATA_ERROR = new ErrorCode(503, "数据异常,请勿点击过快,请稍等再试"); public static final ErrorCode DATA_EXCEPTION_ERROR = new ErrorCode(505, "数据异常,请联系客服处理"); - public static final ErrorCode DATA_DATA_ERROR = new ErrorCode(506, "文档数据异常,请稍后重试或联系客服处理"); + public static final ErrorCode DATA_DATA_ERROR = new ErrorCode(506, "文档数据异常,请勿频繁操作,请稍后重试"); // ========== 自定义错误段 ========== public static final ErrorCode REPEATED_REQUESTS = new ErrorCode(900, "重复请求,请稍后重试"); // 重复请求 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 d18eb1434..b376dfee4 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.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:datasource-connect','system:report:datasource-connect')") public CommonResult createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) { return success(datasourceService.createDatasource(createReqVO)); } 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 f26096637..f41607ed9 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 @@ -60,14 +60,14 @@ public class ReportTemplateController { @PutMapping("/template") @Operation(summary = "创建报表模板") @OperateLog(type = CREATE) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:insert','base:report:insert')") public CommonResult createTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) { return success(templateService.createReportTemplate(createReqVO)); } @PutMapping("/template/copy") @Operation(summary = "复制报表模板") - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:copy','base:report:copy')") public CommonResult copyTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) { return success(templateService.copyReportTemplate(createReqVO)); } @@ -75,7 +75,7 @@ public class ReportTemplateController { @PostMapping("/template") @Operation(summary = "更新报表模板") @OperateLog(type = UPDATE) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:update','base:report:update','system:report:save','base:report:save')") public CommonResult updateTemplate(@Valid @RequestBody ReportTemplateSaveReqVO updateReqVO) { return success(templateService.updateReportTemplate(updateReqVO)); } @@ -83,7 +83,7 @@ public class ReportTemplateController { @DeleteMapping("/template/{id}") @Operation(summary = "删除报表模板") @Parameter(name = "id", description = "模板id", required = true) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:delete','base:report:delete')") public CommonResult deleteReportTemplate(@PathVariable("id") Long id) { templateService.deleteReportTemplate(id); return success(true); @@ -212,7 +212,7 @@ public class ReportTemplateController { @GetMapping("/xml/{id}") @Operation(summary = "导出模版") @Parameter(name = "id", description = "模板id", required = true) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:export','base:report:export')") public void exportTemplate(@PathVariable("id") Long templateId, HttpServletResponse response) { templateService.exportTemplate(templateId, response); } @@ -220,7 +220,7 @@ public class ReportTemplateController { @PutMapping("/xml") @Operation(summary = "导入模版") @OperateLog(type = IMPORT) - @PreAuthorize("@ss.hasPermission('report:design')") + @PreAuthorize("@ss.hasAnyPermissions('system:report:import','base:report:import')") public CommonResult importTemplate(@RequestParam("name") @NotEmpty(message = "模版名称不能为空") String name, @RequestParam("file") MultipartFile file) { templateService.importTemplate(name, file); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java index 54ddbcb7b..537299dd2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java @@ -52,7 +52,7 @@ public class SystemConfigController { @PostMapping("/status") @Operation(summary = "修改系统配置状态") @OperateLog(type = UPDATE) - @PreAuthorize("@ss.hasPermission('system:base-setting:setting')") + @PreAuthorize("@ss.hasPermission('system:base-setting:update')") public CommonResult updateConfigStatus(@Valid @RequestBody ConfigUpdateStatusReqVO reqVO){ systemConfigService.updateStatus(reqVO); return success(true); @@ -61,7 +61,7 @@ public class SystemConfigController { @PostMapping("/sort") @Operation(summary = "修改系统配置的顺序") @OperateLog(type = UPDATE) - @PreAuthorize("@ss.hasPermission('system:base-setting:setting')") + @PreAuthorize("@ss.hasPermission('system:base-setting:update')") public CommonResult updateConfigSort(@Valid @RequestBody List reqVO){ systemConfigService.updateConfigSort(reqVO); return success(true); @@ -70,7 +70,7 @@ public class SystemConfigController { @PostMapping() @Operation(summary = "新增/修改系统配置") - @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:setting','system:base-setting:save','system:base-setting:copy')") + @PreAuthorize("@ss.hasAnyPermissions('system:base-setting:update','system:base-setting:save','system:base-setting:copy','system:base-setting:inset')") public CommonResult modifySystemConfig(@Valid @RequestBody ConfigSaveReqVO reqVO) { systemConfigService.modifySystemConfig(reqVO); return success(true);