报表基础模块：1、报表模板新增datasourceids、datasetids；2、数据源不再依赖模板，独立存在；

cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportCommonServiceImplTest.java

@@ -30,7 +30,6 @@ public abstract class ReportCommonServiceImplTest {
                 .name("单元测试模板")
                 .content(JsonUtil.zipString(TEMPLATE))
                 .remark(RandomUtils.randomString())
-                .datasource(new ArrayList<>())
                 .build();
 
     }
@@ -39,14 +38,12 @@ public abstract class ReportCommonServiceImplTest {
         return ReportDatasourceSaveReqVO.builder()
                 .id(id)
                 .name("单元测试数据源")
-                .templateId(reportId)
                 .type(ReportDatasourceTypeEnum.SPRING.getDesc())
                 .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())
-                .datasets(new ArrayList<>())
                 .build();
     }
 

cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java

@@ -70,7 +70,7 @@ public class ReportDatasourceServiceImplTest extends ReportCommonServiceImplTest
         reqVO.setTemplateId(templateId);
         reqVO.setType(ReportDatasourceTypeEnum.JDBC.getCode());
         reqVO.setName(updateReqVO.getName());
-        List<ReportDatasourceDO> templateDatasourceList = reportDatasourceService.getTemplateDatasourceList(reqVO);
+        List<ReportDatasourceDO> templateDatasourceList = reportDatasourceService.getDatasourceList();
 
         assertNotNull(templateDatasourceList);
         assertNotEquals(0, templateDatasourceList.size());