Authored by wangtao

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/anji-plus-re…

…port into master-500-dev
... ... @@ -91,9 +91,21 @@ public class ExportServiceImpl implements ExportService {
}
;
});
//组合大屏组件
Map<String, List<ReportDashboard>> reportDashboardMap = reportDashboardList.stream().collect(Collectors.groupingBy(ReportDashboard::getReportCode));
Map<String, List<ReportDashboardWidget>> reportDashboardWidgetMap = reportDashboardWidgetList.stream().collect(Collectors.groupingBy(ReportDashboardWidget::getReportCode));
for (Report report : reportList) {
if (reportDashboardMap.get(report.getReportCode()) != null) {
report.setReportDashboardList(reportDashboardMap.get(report.getReportCode()));
}
if (reportDashboardWidgetMap.get(report.getReportCode()) != null) {
report.setReportDashboardWidgetList(reportDashboardWidgetMap.get(report.getReportCode()));
}
}
if (setCodeList.size() == 0) {
return reportList;
}
//接口地址
List<DataSet> dataSetList = dataSetService.list(new LambdaQueryWrapper<DataSet>()
.in(DataSet::getSetCode, setCodeList));
... ... @@ -107,21 +119,6 @@ public class ExportServiceImpl implements ExportService {
//数据转换
List<DataSetTransform> dataSetTransformList = dataSetTransformService.list(new LambdaQueryWrapper<DataSetTransform>()
.in(DataSetTransform::getSetCode, setCodes));
//数据源
List<String> sourceCodeList = dataSetList.stream().map(DataSet::getSourceCode).distinct().collect(Collectors.toList());
List<DataSource> dataSourceList = dataSourceService.list(new LambdaQueryWrapper<DataSource>()
.in(DataSource::getSourceCode, sourceCodeList));
//组合大屏组件
Map<String, List<ReportDashboard>> reportDashboardMap = reportDashboardList.stream().collect(Collectors.groupingBy(ReportDashboard::getReportCode));
Map<String, List<ReportDashboardWidget>> reportDashboardWidgetMap = reportDashboardWidgetList.stream().collect(Collectors.groupingBy(ReportDashboardWidget::getReportCode));
for (Report report : reportList) {
if (reportDashboardMap.get(report.getReportCode()) != null) {
report.setReportDashboardList(reportDashboardMap.get(report.getReportCode()));
}
if (reportDashboardWidgetMap.get(report.getReportCode()) != null) {
report.setReportDashboardWidgetList(reportDashboardWidgetMap.get(report.getReportCode()));
}
}
//组合组件接口
Map<String, List<DataSet>> dataSetMap = dataSetList.stream().collect(Collectors.groupingBy(DataSet::getSetCode));
reportDashboardWidgetList.stream().filter(item -> item.getData().contains("setCode")).forEach(reportDashboardWidget -> {
... ... @@ -132,6 +129,11 @@ public class ExportServiceImpl implements ExportService {
}
}
});
//数据源
List<String> sourceCodeList = dataSetList.stream().map(DataSet::getSourceCode).distinct().collect(Collectors.toList());
List<DataSource> dataSourceList = dataSourceService.list(new LambdaQueryWrapper<DataSource>()
.in(DataSource::getSourceCode, sourceCodeList));
//组合接口参数转换数据源
Map<String, List<DataSetTransform>> dataSetTransformMap = dataSetTransformList.stream().collect(Collectors.groupingBy(DataSetTransform::getSetCode));
Map<String, List<DataSetParam>> dataSetParamMap = dataSetParamList.stream().collect(Collectors.groupingBy(DataSetParam::getSetCode));
... ...