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

报表基础模块：移除BUILDIN数据源的解析

Browse Source
This commit is contained in:
gaoqr
2024-09-04 18:32:43 +08:00
parent 7cac04e95e
commit 54ce827f9a
2 changed files with 2 additions and 3 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/enums/datasource/ReportDatasourceTypeEnum.java
+1 -2
View File
@@ -15,8 +15,7 @@ import lombok.Getter;
public enum ReportDatasourceTypeEnum { public enum ReportDatasourceTypeEnum {
JDBC(0, "jdbc"), JDBC(0, "jdbc"),
SPRING(1, "spring"), SPRING(1, "spring"),
BUILDIN(2, "buildin"), API(2, "api");
API(3, "api");
@EnumValue @EnumValue
private final Integer code; private final Integer code;
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
+1 -1
View File
@@ -336,7 +336,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 忽略转换的字段名，手动转列表 // 忽略转换的字段名，手动转列表
String ignorePropertieName = "datasets"; String ignorePropertieName = "datasets";
switch (ds.getType()) { switch (ds.getType()) {
case JDBC, BUILDIN -> { case JDBC -> {
// 转换对应的ureport对象 // 转换对应的ureport对象
JdbcDatasourceDefinition jdbcDatasourceDefinition = BeanUtil.copyProperties(ds, JdbcDatasourceDefinition.class, ignorePropertieName); JdbcDatasourceDefinition jdbcDatasourceDefinition = BeanUtil.copyProperties(ds, JdbcDatasourceDefinition.class, ignorePropertieName);
datasetDefinitions.addAll(BeanUtils.toBean(datasetList, SqlDatasetDefinition.class)); datasetDefinitions.addAll(BeanUtils.toBean(datasetList, SqlDatasetDefinition.class));