Merge remote-tracking branch 'origin/main'

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, "重复请求，请稍后重试"); // 重复请求

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<Long> 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<Boolean> 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<Boolean> deleteDataset(@PathVariable("id") Long id) {
         datasetService.deleteDataset(id);
         return success(true);

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','base:report:datasource-connect')")
     public CommonResult<Long> 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<Boolean> 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<Boolean> 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<Boolean> 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);

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<ReportTemplateRespVO> 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<Long> 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<ReportTemplateRespVO> 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<Boolean> deleteReportTemplate(@PathVariable("id") Long id) {
         templateService.deleteReportTemplate(id);
         return success(true);
@@ -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<HtmlReport> 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);
     }
@@ -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<Boolean> importTemplate(@RequestParam("name") @NotEmpty(message = "模版名称不能为空") String name, @RequestParam("file") MultipartFile file) {
         templateService.importTemplate(name, file);
         return success(true);

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<Boolean> 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<Boolean> updateConfigSort(@Valid @RequestBody List<ConfigUpdateSortReqVO> 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<Boolean> modifySystemConfig(@Valid @RequestBody ConfigSaveReqVO reqVO) {
         systemConfigService.modifySystemConfig(reqVO);
         return success(true);