From c47157141f9a24f838df8da3dd611fd4ff502c0c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 18 Aug 2022 12:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8A=A5=E8=A1=A8=E3=80=91pc=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=89=B9=E9=87=8F=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD-=E7=94=B1=E4=BA=8E=E7=A7=AF=E6=9C=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=8F=96=E6=B6=88=E5=A4=9A=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcCustomerReportServiceImpl.java | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java index 27450721d8..4f6277d886 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java @@ -55,8 +55,6 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -279,20 +277,29 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl>> fResult = jiMuReportOpenFeignClient.fieldTree(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到字段列表,报表ID：" + reportId, "根据报表id未找到字段列表,报表ID：" + reportId); + } String datasourceId = fResult.getResult().get(0).get(0).getDbId(); // 报表数据源信息 JiMuResult dbData = jiMuReportOpenFeignClient.loadDbData(datasourceId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到数据源,报表ID：" + reportId, "根据报表id未找到数据源,报表ID：" + reportId); + } JimuReportDbDataResultDTO.ReportDB reportDb = dbData.getResult().getReportDb(); // 报表简要信息 JiMuResult reportBriefResult = jiMuReportOpenFeignClient.getReportBrief(reportId); + if (fResult == null || !fResult.isSuccess()) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "根据报表id未找到报表信息,报表ID：" + reportId, "根据报表id未找到报表信息,报表ID：" + reportId); + } JiMuReportBriefResultDTO reportBrief = reportBriefResult.getResult(); // api的url String apiUrl = reportDb.getApiUrl(); // api方法 - //String apiMethod = reportDb.getApiMethod(); + String apiMethod = reportDb.getApiMethod(); // 是否是集合 //String isList = reportDb.getIsList(); // 返回的列表中，哪个字段是ID @@ -318,13 +325,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName); + HashMap idAndNames = listBizObjectIdAndName(bizId, paramKey, apiUrl, isHttps, idFieldName, nameFieldName, apiMethod); // 3. 然后以这一列作为查询条件，循环，继续调用该接口，得到单条数据，每一条数据都下载一个excel，最后将其打包为一个压缩包下载 Path storePath = makeTemporaryDownloadDir(reportId); // 4.生成压缩文件 - Path zipFile = downloadAndComppress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); + Path zipFile = downloadAndCompress(storePath, reportId, reportBrief.getName(), paramKey, idAndNames); // 5.下载 try (FileInputStream fis = new FileInputStream(zipFile.toFile())) { @@ -350,7 +357,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl idAndNames) { + private Path downloadAndCompress(Path storePath, String reportId, String reportName, String paramKey, HashMap idAndNames) { // 请求头 Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); @@ -382,21 +389,22 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl> idParts = ListUtils.partition(idList, 100); - // 1. 循环下载所有id对应的excel - CountDownLatch cdl = new CountDownLatch(idParts.size()); + // 1. 循环下载所有id对应的excel（积木报表的导出接口有并发问题，多线程会导出空表，暂时不用多线程了） + //CountDownLatch cdl = new CountDownLatch(idParts.size()); for (List idPart : idParts) { - CompletableFuture.runAsync(() -> { - downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); - }, executorService); + downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files); + //CompletableFuture.runAsync(() -> { + // downloadXlsByBatchByBizId(reportId, idPart, idAndNames, param, xlsxStorePath, files, cdl); + //}, executorService); } // 等待多线程执行完成，再执行打包 - try { - cdl.await(); - } catch (InterruptedException e) { - log.error(ExceptionUtils.getErrorStackTrace(e)); - throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); - } + //try { + // cdl.await(); + //} catch (InterruptedException e) { + // log.error(ExceptionUtils.getErrorStackTrace(e)); + // throw new EpmetException("【报表批量导出】CountDownLatch等待被中断"); + //} // 2,打包 Path zipFile = storePath.resolve(reportName + "_" + currentTimeStr + ".zip"); @@ -409,11 +417,9 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl 0; ) { @@ -436,7 +442,13 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizObjNameAndCount, String bizObjName) { + /** + * 为业务对象名称编号，解决重名对象问题 + * @param bizObjNameAndCount 业务对象名称/出现次数map + * @param bizObjName 原始业务对象名 + * @return + */ + public String getNumberedObjName(HashMap bizObjNameAndCount, String bizObjName) { Integer nameCount = bizObjNameAndCount.get(bizObjName); if (nameCount == null) { nameCount = 1; @@ -460,8 +472,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files, - CountDownLatch cdl) { + public void downloadXlsByBatchByBizId(String reportId, List bizIds, Map idAndNames, JimuReportExportRequestDTO param, Path xlsxStorePath, Map files) { for (String id : bizIds) { try { @@ -495,7 +506,7 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName) { + public HashMap listBizObjectIdAndName(String id, String paramKey, String apiUrl, boolean isHttps, String idFieldName, String nameFieldName, String apiMethod) { apiUrl = apiUrl.replace("'${id}'", id == null ? "" : id); apiUrl = apiUrl.replace("'${paramKey}'", paramKey); Map headers = new HashMap<>(); headers.put(Constant.AUTHORIZATION_HEADER, EpmetRequestHolder.getHeader(Constant.AUTHORIZATION_HEADER)); - Result stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":" + id + "}", headers); + + Result stringResult; + // 请求方法0-get,1-post + if (NumConstant.ONE_STR.equals(apiMethod)) { + stringResult = HttpClientManager.getInstance().sendPost(apiUrl, isHttps, "{\"id\":\"" + (id == null ? "" : id) + "\"}", headers); + } else { + stringResult = HttpClientManager.getInstance().sendGet(apiUrl, isHttps, null, headers); + } JSONObject dataJsonObject = JSON.parseObject(stringResult.getData()); Object data = dataJsonObject.get("data"); - JSONArray array = new JSONArray(); + JSONArray array; HashMap idAndNames = new HashMap<>(); if (data instanceof JSONObject) {