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-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

报表基础模块：1、报表三大对象列表筛选、操作权限完善；2、报表接口恢复@PreAuthorize权限控制；

Browse Source
This commit is contained in:
gaoqr
2024-09-09 17:26:45 +08:00
parent 0101e58216
commit 927e062737
14 changed files with 185 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasetServiceImplTest.java
+4 -2
View File
@@ -4,6 +4,7 @@ import com.cf.imes.framework.test.core.util.RandomUtils;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetReqVO;
import com.cf.imes.module.report.controller.admin.dataset.vo.ReportDatasetSaveReqVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO;
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.module.report.dal.dataobject.dataset.ReportDatasetDO;
import com.cf.imes.module.report.dal.dataobject.datasource.ReportDatasourceDO;
@@ -49,8 +50,9 @@ public class ReportDatasetServiceImplTest extends ReportCommonServiceImplTest{
// 2、插入template、断言自增id
// 3、用id查template、断言对象
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
assertNotNull(templateId);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
assertNotNull(reportTemplate);
Long templateId = reportTemplate.getId();
ReportTemplateDO template = reportTemplateService.getReportTemplate(templateId);
assertNotNull(template);
cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java
+3 -1
View File
@@ -3,6 +3,7 @@ package com.cf.imes.module.report.service.template;
import com.cf.imes.framework.test.core.util.RandomUtils;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceReqVO;
import com.cf.imes.module.report.controller.admin.datasource.vo.ReportDatasourceSaveReqVO;
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.module.report.dal.dataobject.datasource.ReportDatasourceDO;
import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO;
@@ -41,7 +42,8 @@ public class ReportDatasourceServiceImplTest extends ReportCommonServiceImplTest
// 2、插入template、断言自增id
// 3、用id查template、断言对象
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
Long templateId = reportTemplate.getId();
assertNotNull(templateId);
ReportTemplateDO template = reportTemplateService.getReportTemplate(templateId);
assertNotNull(template);
cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImplTest.java
+9 -5
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.report.service.template;
import com.cf.imes.framework.test.core.util.RandomUtils;
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.module.report.dal.dataobject.template.ReportTemplateDO;
import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum;
@@ -35,7 +36,8 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
System.out.println("template压缩后大小：" + createReqVO.getContent().length());
// 插入
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
Long templateId = reportTemplate.getId();
// 断言
assertNotNull(templateId);
// 校验是否插入
@@ -56,7 +58,8 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
System.out.println("template压缩后大小：" + createReqVO.getContent().length());
// 插入
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
Long templateId = reportTemplate.getId();
//准备更新参数
ReportTemplateSaveReqVO updateReqVO = prepareTemplateReqVO(templateId);
@@ -86,7 +89,8 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
// 准备参数
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
// 插入
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
Long templateId = reportTemplate.getId();
// 删除
reportTemplateService.deleteReportTemplate(templateId);
@@ -111,8 +115,8 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
// 准备参数
ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
// 插入
Long templateId = reportTemplateService.createReportTemplate(createReqVO);
ReportTemplateRespVO reportTemplate = reportTemplateService.createReportTemplate(createReqVO);
Long templateId = reportTemplate.getId();
ReportTemplateReqVO reqVO = new ReportTemplateReqVO();
reqVO.setType(ReportTemplateTypeEnum.SYSTEM.getType());