提交 3b8fcfe8 authored 作者: songchuancai's avatar songchuancai

优化代码

上级 d16c76ed
......@@ -117,6 +117,9 @@ public class ColumnDataRangeFilter {
public static List<List<String>> generateExcelHead(List<ColumnDataRangeFilter> columnDataRangeFilters) {
List<List<String>> result = new ArrayList<>();
if(CollectionUtils.isEmpty(columnDataRangeFilters)){
return result;
}
for (ColumnDataRangeFilter columnDataRangeFilter : columnDataRangeFilters) {
result.addAll(columnDataRangeFilter.generateExcelHead());
}
......
......@@ -39,6 +39,9 @@ public class DataApiDataSource extends BaseEntity {
// 数据驱动
@Column(name = "driver", columnDefinition = "varchar2(255)", nullable = false)
private String driver;
// 环境 0: 测试,1: 生产
@Column(name = "environment", columnDefinition = "number(1) default 0 ", nullable = false)
private Integer environment;
public DataSourceVo toItem(){
DataSourceVo dataSourceVo = new DataSourceVo();
......
......@@ -446,6 +446,7 @@ public class DataApiServiceManagementServiceImpl implements DataApiServiceManage
queryDataTask.setDataApiDataSource(dataSource);
queryDataTask.setQuerySql(dataSql);
queryDataTask.setPageNumber(1L);
queryDataTask.setColumnHeads(ColumnDataRangeFilter.generateExcelHead(dataApiModelConfig.getColumnDataRangeConfig()));
queryDataTask.setJdbcParamValues(jdbcParamValues);
Future<?> future = debugQueryDataThreadPool.addExecuteTask(queryDataTask);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论