From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 de7aa9d..d8e61a2 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
@@ -350,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;
}
@@ -688,17 +687,26 @@
List<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
//设置页码数
conditionVo.setCurrentPage(1);
- conditionVo.setPageSize(100);
- System.out.println("sysStartTIme = " + now());
+ conditionVo.setPageSize(1000);
+ if(null==conditionVo.getDecisioDiagramResult() || conditionVo.getDecisioDiagramResult()=="" || conditionVo.getDecisioDiagramResult().equals("undefined") ){
+ conditionVo.setDecisioDiagramResult(null);
+ }
+ if(null==conditionVo.getStartTime() || conditionVo.getStartTime()==""|| conditionVo.getStartTime().equals("undefined") ){
+ conditionVo.setStartTime(null);
+ }
+ if(null==conditionVo.getEndTime() || conditionVo.getEndTime()=="" || conditionVo.getEndTime().equals("undefined") ){
+ conditionVo.setEndTime(null);
+ }
+ System.out.println("conditionVo 后 = " + conditionVo);
//获取数据
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);
@@ -711,7 +719,6 @@
}
//合并集合
List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("sysEndTIme = " + now());
return parcelExcels;
}
return null;
@@ -725,15 +732,20 @@
public List<ParcelKindExcel> exportParcelKind(ConditionVo conditionVo) {
List<List<ParcelKindExcel>> parcelKindExcelList = new ArrayList<>();
List<ParcelKindExcel> list = new ArrayList<>();
- System.out.println("sysStartTIme = " + now());
if(null!=conditionVo.getTimeDesc() && conditionVo.getTimeDesc()!="" && !conditionVo.getTimeDesc().equals("undefined") ){
//设置页码数
ConditionVo vo = new ConditionVo();
vo.setCurrentPage(1);
vo.setPageSize(100);
- vo.setDecisioDiagramResult(conditionVo.getDecisioDiagramResult());
- vo.setStartTime(conditionVo.getStartTime());
- vo.setEndTime(conditionVo.getEndTime());
+ if(null!=conditionVo.getDecisioDiagramResult() && conditionVo.getDecisioDiagramResult()!="" && !conditionVo.getDecisioDiagramResult().equals("undefined") ){
+ vo.setDecisioDiagramResult(conditionVo.getDecisioDiagramResult());
+ }
+ if(null!=conditionVo.getStartTime() && conditionVo.getStartTime()!="" && !conditionVo.getStartTime().equals("undefined") ) {
+ vo.setStartTime(conditionVo.getStartTime());
+ }
+ if(null!=conditionVo.getEndTime() && conditionVo.getEndTime()!="" && !conditionVo.getEndTime().equals("undefined") ) {
+ vo.setEndTime(conditionVo.getEndTime());
+ }
Map<String,Object> result =(Map<String,Object>) getParcelDataPageList(vo, PARCEL_KIND_URL, PARCEL_KEY, PARCEL_SECRET).get("result");
if (null!=result){
String data = result.get("data").toString();
@@ -762,6 +774,15 @@
}else {
conditionVo.setCurrentPage(1);
conditionVo.setPageSize(100);
+ if(null==conditionVo.getDecisioDiagramResult() || conditionVo.getDecisioDiagramResult()=="" || conditionVo.getDecisioDiagramResult().equals("undefined") ){
+ conditionVo.setDecisioDiagramResult(null);
+ }
+ if(null==conditionVo.getStartTime() || conditionVo.getStartTime()=="" || conditionVo.getStartTime().equals("undefined") ){
+ conditionVo.setStartTime(null);
+ }
+ if(null==conditionVo.getEndTime() || conditionVo.getEndTime()=="" || conditionVo.getEndTime().equals("undefined") ){
+ conditionVo.setEndTime(null);
+ }
Map<String,Object> result =(Map<String,Object>) getParcelDataPageList(conditionVo, PARCEL_KIND_URL, PARCEL_KEY, PARCEL_SECRET).get("result");
//获取违禁品数据
if (null!=result) {
@@ -783,7 +804,6 @@
}
//合并集合并返回
List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("sysEndTIme = " + now());
return parcelKindExcels;
}
}
--
Gitblit v1.9.3