报表基础模块：1、模拟前端保存、获取模板列表、查询模板详情接口对接及啊对应字段的调整；2、移除没用部分引用和代码（积木等）；

2026-08-14 13:42:07 +08:00 · 2024-07-11 16:00:22 +08:00
parent 129f919405
commit f75cf19fdc
48 changed files with 396 additions and 940 deletions
@@ -2,6 +2,7 @@ package com.cf.imes.module.report.service.template;

 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.framework.test.core.util.RandomUtils;
+import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetFieldVO;
 import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetParameterVO;
 import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasetSaveReqVO;
 import com.cf.imes.module.report.controller.admin.template.vo.ReportDatasourceSaveReqVO;
@@ -27,7 +28,7 @@ public abstract class ReportCommonServiceImplTest {
        return ReportTemplateSaveReqVO.builder()
                .id(id)
                .name("单元测试模板")
-                .template(JsonUtil.zipString(TEMPLATE))
+                .content(JsonUtil.zipString(TEMPLATE))
                .type(ReportTemplateTypeEnum.SYSTEM.getType())
                .remark(RandomUtils.randomString())
                .build();
@@ -38,29 +39,35 @@ public abstract class ReportCommonServiceImplTest {
        return ReportDatasourceSaveReqVO.builder()
                .id(id)
                .name("单元测试数据源")
-                .reportId(reportId)
-                .type(ReportTemplateTypeEnum.SYSTEM.getType())
-                .dbDriver("com.mysql.cj.jdbc.Driver")
-                .dbUrl("jdbc:mysql://192.168.1.205:3307/imes_base?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true")
-                .dbUsername("root")
-                .dbPassword("root")
+                .templateId(reportId)
+                .type("jdbc")
+                .driver("com.mysql.cj.jdbc.Driver")
+                .url("jdbc:mysql://192.168.1.205:3307/imes_base?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("root")
                .remark(RandomUtils.randomString())
                .build();
    }

    protected ReportDatasetSaveReqVO prepareDatasetReqVO(Long id, Long datasourceId) {
-        ReportDatasetParameterVO idvo = new ReportDatasetParameterVO("id", 1, "1");
-        ReportDatasetParameterVO appidvo = new ReportDatasetParameterVO("app_id", 2, "CF7526AD51");
+        ReportDatasetParameterVO idvo = new ReportDatasetParameterVO("id", "Integer", "1");
+        ReportDatasetParameterVO appidvo = new ReportDatasetParameterVO("app_id", "String", "CF7526AD51");
        List<ReportDatasetParameterVO> params = new ArrayList<>() {{
            add(idvo);
            add(appidvo);
        }};
+
+        ReportDatasetFieldVO idfield = new ReportDatasetFieldVO("id");
+        List<ReportDatasetFieldVO> fields = new ArrayList<>() {{
+            add(idfield);
+        }};
        return ReportDatasetSaveReqVO.builder()
                .id(id)
                .name("单元测试数据集")
-                .dbSql("select * from application where id = \"${param(\"id\")}\" and app_id = \"${param(\"app_id\")}\"")
+                .sql("select * from application where id = \"${param(\"id\")}\" and app_id = \"${param(\"app_id\")}\"")
                .datasourceId(datasourceId)
-                .params(params)
+                .parameters(params)
+                .fields(fields)
                .build();
    }
 }
@@ -66,7 +66,7 @@ public class ReportDatasourceServiceImplTest extends ReportCommonServiceImplTest

        // 列表查询参数准备
        ReportDatasourceReqVO reqVO = new ReportDatasourceReqVO();
-        reqVO.setReportId(templateId);
+        reqVO.setTemplateId(templateId);
        reqVO.setType(ReportTemplateTypeEnum.SYSTEM.getType());
        reqVO.setName(updateReqVO.getName());
        List<ReportDatasourceDO> templateDatasourceList = reportDatasourceService.getTemplateDatasourceList(reqVO);
@@ -33,7 +33,7 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
        setOrganId();
        // 准备参数
        ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
-        System.out.println("template压缩后大小：" + createReqVO.getTemplate().length());
+        System.out.println("template压缩后大小：" + createReqVO.getContent().length());
        // 插入
        Long templateId = reportTemplateService.createReportTemplate(createReqVO);
        // 断言
@@ -41,7 +41,7 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
        // 校验是否插入
        ReportTemplateDO template = reportTemplateService.getReportTemplate(templateId);
        assertNotNull(template);
-        String templateUnZip = template.getTemplate();
+        String templateUnZip = template.getContent();
        System.out.println("从库中读取template大小：" + templateUnZip.length());
        // 校验解压内容是否正确
        assertEquals(JsonUtil.unzipString(templateUnZip),TEMPLATE);
@@ -54,7 +54,7 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
        setOrganId();
        // 准备参数
        ReportTemplateSaveReqVO createReqVO = prepareTemplateReqVO(null);
-        System.out.println("template压缩后大小：" + createReqVO.getTemplate().length());
+        System.out.println("template压缩后大小：" + createReqVO.getContent().length());
        // 插入
        Long templateId = reportTemplateService.createReportTemplate(createReqVO);

@@ -65,6 +65,7 @@ public class ReportTemplateServiceImplTest extends ReportCommonServiceImplTest {
        reportTemplateService.updateReportTemplate(updateReqVO);
        // 校验是否更新正确
        ReportTemplateDO template = reportTemplateService.getReportTemplate(updateReqVO.getId()); // 获取最新的
+        assertNotNull(template);
        isPojoEquals(template,updateReqVO);
        // 删除
        reportTemplateService.deleteReportTemplate(templateId);