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/feign/ReportFeign.java | 130 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 117 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index b1fde4d..ebd565a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -12,6 +12,8 @@
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -36,6 +38,33 @@
public List<AlarmExcel> getAlarmList(@RequestBody String body){
Map<String,Object> map = JSONObject.parseObject(body);
//创建对象，并封装数据
+ AlarmVO alarmVO = getAlarmVO(map);
+ //查询数据并返回数据
+ List<AlarmExcel> excelList = iAlarmService.exportAlarm(alarmVO);
+ return excelList;
+ }
+
+ /**
+ * 获取实时警情数据集合
+ * @param body map集合数据
+ * @return
+ */
+ @PostMapping("getAlarmPie")
+ public List<ReportReturnData> getAlarmPie(@RequestBody String body){
+ Map<String,Object> map = JSONObject.parseObject(body);
+ //创建对象，并封装数据
+ AlarmVO alarmVO = getAlarmVO(map);
+ //查询数据并返回数据
+ List<ReportReturnData> excelList = iAlarmService.getAlarmPie(alarmVO);
+ return excelList;
+ }
+
+ /**
+ * 封装实时警情查询条件
+ * @param map
+ * @return
+ */
+ private AlarmVO getAlarmVO(Map<String, Object> map) {
AlarmVO alarmVO = new AlarmVO();
if (null!=map.get("beginTime")) {
alarmVO.setBeginTime(map.get("beginTime").toString());
@@ -49,10 +78,9 @@
if (null!=map.get("timeDesc")) {
alarmVO.setTimeDesc(map.get("timeDesc").toString());
}
- //查询数据并返回数据
- List<AlarmExcel> excelList = iAlarmService.exportAlarm(alarmVO);
- return excelList;
+ return alarmVO;
}
+
/**
* 获取健康码数据集合
@@ -63,6 +91,34 @@
public List<HealthcodeExcel> getHealthcodeList(@RequestBody String body){
Map<String,Object> map = JSONObject.parseObject(body);
//创建对象，并封装数据
+ HealthcodeVO healthcodeVO = getHealthcodeVo(map);
+ //查询数据并返回数据
+ List<HealthcodeExcel> excelList = ihealthcodeService.exportHealthcode(healthcodeVO);
+ return excelList;
+ }
+
+
+
+ /**
+ * 获取健康码图标数据
+ * @param body map集合数据
+ * @return
+ */
+ @PostMapping("getHealthcodePie")
+ public List<HealthcodeExcel> getHealthcodePie(@RequestBody String body){
+ Map<String,Object> map = JSONObject.parseObject(body);
+ //创建对象，并封装数据
+ HealthcodeVO healthcodeVO = getHealthcodeVo(map);
+ //查询数据并返回数据
+ return ihealthcodeService.getHealthcodePie(healthcodeVO);
+ }
+
+ /**
+ * 封装健康码条件数据
+ * @param map
+ * @return
+ */
+ private HealthcodeVO getHealthcodeVo(Map<String, Object> map) {
HealthcodeVO healthcodeVO = new HealthcodeVO();
if (null!=map.get("begTime")) {
healthcodeVO.setBegTime(map.get("begTime").toString());
@@ -76,9 +132,7 @@
if (null!=map.get("timeDesc")) {
healthcodeVO.setTimeDesc(map.get("timeDesc").toString());
}
- //查询数据并返回数据
- List<HealthcodeExcel> excelList = ihealthcodeService.exportHealthcode(healthcodeVO);
- return excelList;
+ return healthcodeVO;
}
/**
@@ -90,6 +144,31 @@
public List<AnimalHeatExcel> getAnimalHeatList(@RequestBody String body){
Map<String,Object> map = JSONObject.parseObject(body);
//创建对象，并封装数据
+ AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
+ //查询数据并返回数据
+ return animalHeatService.exportAnimalHeat(animalHeatVo);
+ }
+
+ /**
+ * 获取体温图表数据
+ * @param body map集合数据
+ * @return
+ */
+ @PostMapping("getAnimalHeatPie")
+ public List<ReportReturnData> getAnimalHeatPie(@RequestBody String body){
+ Map<String,Object> map = JSONObject.parseObject(body);
+ //创建对象，并封装数据
+ AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
+ //查询数据并返回数据
+ return animalHeatService.getAnimalHeatPie(animalHeatVo);
+ }
+
+ /**
+ * 体温数据条件封装
+ * @param map
+ * @return
+ */
+ private AnimalHeatVo getAnimalHeatVo(Map<String, Object> map) {
AnimalHeatVo animalHeatVo = new AnimalHeatVo();
if (null!=map.get("begTime")) {
animalHeatVo.setBegTime(map.get("begTime").toString());
@@ -103,9 +182,7 @@
if (null!=map.get("timeDesc")) {
animalHeatVo.setTimeDesc(map.get("timeDesc").toString());
}
- //查询数据并返回数据
- List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo);
- return excelList;
+ return animalHeatVo;
}
/**
@@ -119,10 +196,37 @@
//创建对象，并封装数据
ConditionVo conditionVo = getConditionVo(map);
//查询数据并返回数据
- List<ParcelExcel> excelList = parcelService.exportParcel(conditionVo);
- System.out.println("conditionVo = " + conditionVo);
- System.out.println("excelList = " + excelList);
- return excelList;
+ List<ParcelExcel> parcelExcels = parcelService.exportParcel(conditionVo);
+// List<ParcelExcel> parcelExcels = new ArrayList<>();
+// ParcelExcel parcelExcel = new ParcelExcel();
+// parcelExcel.setCheckMachineCode("ceshi");
+// parcelExcel.setCheckMachineName("ceshi");
+// parcelExcel.setCheckMachinePosition("ceshi");
+// parcelExcel.setImgUrl("ceshi");
+// parcelExcel.setDecisioDiagramResultDetails("ceshi");
+// parcelExcels.add(parcelExcel);
+// try {
+// int time = 9000;
+// System.out.println("休眠时间 = " + time);
+// Thread.sleep(time);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
+ return parcelExcels;
+ }
+
+ /**
+ * 获取包裹数据集合
+ * @param body map集合数据
+ * @return
+ */
+ @PostMapping("getParcelPie")
+ public List<ReportReturnData> getParcelPie(@RequestBody String body){
+ Map<String,Object> map = JSONObject.parseObject(body);
+ //创建对象，并封装数据
+ ConditionVo conditionVo = getConditionVo(map);
+ //查询数据并返回数据
+ return null;
}
/**
--
Gitblit v1.9.3