From a9f2cd13de09651a78463b3df4fd99aca826291c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Apr 2021 18:29:17 +0800
Subject: [PATCH] 新增接口:根据处警人员编码删除电子围栏信息

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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..de7aa9d 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;
 
@@ -684,11 +685,11 @@
 	 */
 	@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);
+		System.out.println("sysStartTIme = " + now());
 		//获取数据
 		Map<String,Object> result =(Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
 		if (null!=result) {
@@ -710,7 +711,7 @@
 			}
 			//合并集合
 			List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
-			System.out.println("parcelExcels = " + parcelExcels);
+			System.out.println("sysEndTIme = " + now());
 			return parcelExcels;
 		}
 		return null;
@@ -724,6 +725,7 @@
 	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();
@@ -781,6 +783,7 @@
 				}
 				//合并集合并返回
 				List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+				System.out.println("sysEndTIme = " + now());
 				return parcelKindExcels;
 			}
 		}
@@ -865,4 +868,5 @@
 		}
 		return list;
 	}
+
 }

--
Gitblit v1.9.3