Merge branch 'dev_jmreport' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java

@@ -244,11 +244,15 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
             if (!report.isSuccess()) {
                 throw new EpmetException("获取jm报表详情失败：" + r);
             }
-            JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class);
-            JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r);
+
+            JiMuResult<List<List<JimuReportFieldTreeResultDTO>>> fResult = jiMuReportOpenFeignClient.fieldTree(r);
+            String datasourceId = fResult.getResult().get(0).get(0).getDbId();
+
+            JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(datasourceId);
             if (!reportDbDataResultDTOJiMuResult.isSuccess()){
                 throw new EpmetException("获取报表dbData失败："+r);
             }
+            JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class);
             log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult));
             JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb();
             if (null != reportDb){