Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

日志管理-系统记录操作类型修改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-05 17:25:12 +08:00
parent 418ac7cc79
commit 5875e360e2
12 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/dataset/ReportDatasetController.java
+5 -1
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.report.controller.admin.dataset;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetRespVO;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO;
@@ -16,10 +17,11 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
/**
* 报表数据集控制器
@@ -37,6 +39,7 @@ public class ReportDatasetController {
@PutMapping("/dataset")
@Operation(summary = "创建报表数据集")
@OperateLog(type = CREATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Long> createDataset(@Valid @RequestBody ReportDatasetSaveReqVO createReqVO) {
return success(datasetService.createDataset(createReqVO));
@@ -44,6 +47,7 @@ public class ReportDatasetController {
@PostMapping("/dataset")
@Operation(summary = "更新报表数据集")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Boolean> updateDataset(@Valid @RequestBody ReportDatasetSaveReqVO updateReqVO) {
datasetService.updateDataset(updateReqVO);
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
+9 -6
View File
@@ -6,11 +6,8 @@ import com.bstek.datasource.service.DataSourceService;
import com.bstek.ureport.definition.dataset.Field;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportBeanDatasourceRespVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourcePreviewReqVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceRespVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceTestConnReqVO;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.report.controller.admin.datasource.vo.*;
import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO;
import com.cf.imes.module.report.service.datasource.ReportDatasourceService;
import com.cf.imes.module.report.utils.TenantParamsUtils;
@@ -25,13 +22,14 @@ import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import static com.cf.imes.framework.common.pojo.CommonResult.error;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.CREATE;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.UPDATE;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.DATASOURCE_CONNECT_FAIL;
/**
@@ -56,6 +54,7 @@ public class ReportDatasourceController {
@PutMapping("/datasource")
@Operation(summary = "创建报表数据源")
@OperateLog(type = CREATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Long> createDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO createReqVO) {
return success(datasourceService.createDatasource(createReqVO));
@@ -63,6 +62,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource")
@Operation(summary = "更新报表数据源")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Boolean> updateDatasource(@Valid @RequestBody ReportDatasourceSaveReqVO updateReqVO) {
datasourceService.updateDatasource(updateReqVO);
@@ -128,6 +128,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource/tables")
@Operation(summary = "获取数据库表列表")
@OperateLog(enable = false)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<List<Map<String, String>>> getDatasourceTables(@RequestBody @Valid ReportDatasourceTestConnReqVO reqVO) {
return success(ureportDataSourceService.selectTableList(BeanUtils.toBean(reqVO, DataSourceInfo.class)));
@@ -135,6 +136,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource/table/fields")
@Operation(summary = "获取数据源表字段")
@OperateLog(enable = false)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<List<Field>> getDatasourceTableFields(@RequestBody @Valid ReportDatasourcePreviewReqVO reqVO) {
return success(datasourceService.getTableFields(tenantParamsUtils.prepareTenantParam(reqVO)));
@@ -142,6 +144,7 @@ public class ReportDatasourceController {
@PostMapping("/datasource/preview")
@Operation(summary = "数据源预览")
@OperateLog(enable = false)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Map<String, Object>> previewData(@RequestBody @Valid ReportDatasourcePreviewReqVO reqVO) {
return success(ureportDataSourceService.previewData(tenantParamsUtils.prepareTenantParam(reqVO)));
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
+9 -6
View File
@@ -12,11 +12,8 @@ import com.bstek.ureport.utils.StringUtils;
import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateCommonPreviewReqVO;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplatePreviewReqVO;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateReqVO;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateRespVO;
import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.report.controller.admin.template.vo.*;
import com.cf.imes.module.report.service.template.ReportTemplateService;
import com.cf.imes.module.report.validation.template.ReportTemplateProducerTypeInEnum;
import io.swagger.v3.oas.annotations.Operation;
@@ -38,12 +35,12 @@ import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Size;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
/**
* 报表模板信息控制器
@@ -62,6 +59,7 @@ public class ReportTemplateController {
@PutMapping("/template")
@Operation(summary = "创建报表模板")
@OperateLog(type = CREATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<ReportTemplateRespVO> createTemplate(@Valid @RequestBody ReportTemplateSaveReqVO createReqVO) {
return success(templateService.createReportTemplate(createReqVO));
@@ -76,6 +74,7 @@ public class ReportTemplateController {
@PostMapping("/template")
@Operation(summary = "更新报表模板")
@OperateLog(type = UPDATE)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<ReportTemplateRespVO> updateTemplate(@Valid @RequestBody ReportTemplateSaveReqVO updateReqVO) {
return success(templateService.updateReportTemplate(updateReqVO));
@@ -110,6 +109,7 @@ public class ReportTemplateController {
@PostMapping("/template/preview")
@Operation(summary = "模板预览")
@OperateLog(enable = false)
@PreAuthorize("@ss.hasPermission('report:preview')")
public CommonResult<HtmlReport> preview(@RequestBody ReportTemplatePreviewReqVO reqVO) {
return success(templateService.preview(reqVO));
@@ -117,6 +117,7 @@ public class ReportTemplateController {
@PostMapping("/template/preview/common/")
@Operation(summary = "模板通用预览")
@OperateLog(enable = false)
public CommonResult<HtmlReport> commonPreview(@RequestBody ReportTemplateCommonPreviewReqVO reqVO) {
return success(templateService.commonPreview(reqVO));
}
@@ -151,6 +152,7 @@ public class ReportTemplateController {
@PostMapping("/template/excel/import")
@Operation(summary = "导入excel模板")
@OperateLog(type = IMPORT)
@PreAuthorize("@ss.hasPermission('report:design')")
public ReportDefinitionWrapper importExcel(@RequestParam("file") MultipartFile file) {
ReportDefinition report = ExcelParserUtils.parser(file);
@@ -217,6 +219,7 @@ public class ReportTemplateController {
@PutMapping("/xml")
@Operation(summary = "导入模版")
@OperateLog(type = IMPORT)
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<Boolean> importTemplate(@RequestParam("name") @NotEmpty(message = "模版名称不能为空") String name, @RequestParam("file") MultipartFile file) {
templateService.importTemplate(name, file);