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-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index 0f20ed7..7e75e53 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -1,7 +1,6 @@
package org.springblade.report.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,10 +11,7 @@
import org.springblade.report.mapper.ReportFileMappers;
import org.springblade.report.service.ReportFileService;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import sun.plugin.javascript.navig.Array;
import java.util.ArrayList;
import java.util.List;
@@ -92,7 +88,6 @@
public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
//将map转换为json对象
String s = JSON.toJSONString(map);
- System.out.println("s = " + s);
if (null!=beanName){
return reportClient.getHealthcodeList(s);
}
@@ -158,7 +153,8 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- return reportClient.getParcelList(body);
+ List<ParcelExcel> parcelList = reportClient.getParcelList(body);
+ return parcelList;
}
return null;
}
--
Gitblit v1.9.3