From d75df3633742564296e8dae307ba59b96c701cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 28 Apr 2021 17:36:02 +0800
Subject: [PATCH] 包裹报表导出超时问题解决，feign调用的时间设置是5s，可以单独对当前接口设置超时时间，修改每次获取第三方接口数据数量，由100条修改为1000条
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 0fbfe87..b164fcd 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -16,6 +16,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
import static org.springblade.core.tool.utils.DateUtil.now;
@@ -24,7 +25,7 @@
* 包裹服务实现层
*/
@Service
-public class ParcelServiceImpl implements ParcelService {
+public class ParcelServiceImpl implements ParcelService{
@Value("${PARCEL_KEY}")
private String PARCEL_KEY;
@@ -349,7 +350,6 @@
map.put("imgKey",imgKey);
//执行http远程调用
String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
- System.out.println("s = " + s);
if (null==s || s=="" || s.isEmpty()){
return null;
}
@@ -684,20 +684,19 @@
*/
@Override
public List<ParcelExcel> exportParcel(ConditionVo conditionVo) {
- System.out.println("conditionVo = " + conditionVo);
- ArrayList<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
+ List<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
//设置页码数
conditionVo.setCurrentPage(1);
- conditionVo.setPageSize(100);
+ conditionVo.setPageSize(1000);
//获取数据
Map<String,Object> result =(Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
if (null!=result) {
String data = result.get("data").toString();
List<ParcelExcel> dataList = JsonUtils.jsonToList(data, ParcelExcel.class);
parcelExcelList.add(dataList);
- //取第一次获取到的数据总数，每次取100条，多于100分批次取
+ //取第一次获取到的数据总数，每次取1000条，多于1000分批次取
int totalSize = Integer.parseInt(result.get("totalSize").toString());
- int i = totalSize/100+1;
+ int i = totalSize/1000+1;
if (i>1){
for (int j=1;j<i;j++) {
conditionVo.setCurrentPage(j+1);
@@ -710,7 +709,6 @@
}
//合并集合
List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("parcelExcels = " + parcelExcels);
return parcelExcels;
}
return null;
@@ -865,4 +863,5 @@
}
return list;
}
+
}
--
Gitblit v1.9.3