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 | 23 ++++++++++++-----------
1 files changed, 12 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 4be1cbe..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
@@ -3,23 +3,20 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.utils.JacksonUtils;
-import io.swagger.models.auth.In;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.util.*;
import org.springblade.jfpt.parcel.vo.ConditionVo;
-import org.springblade.jfpt.parcel.vo.ParcelExcel;
-import org.springblade.jfpt.parcel.vo.ParcelKindExcel;
+import org.springblade.common.entity.ParcelExcel;
+import org.springblade.common.entity.ParcelKindExcel;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import javax.validation.constraints.NotBlank;
-import java.lang.reflect.Array;
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;
@@ -28,7 +25,7 @@
* 包裹服务实现层
*/
@Service
-public class ParcelServiceImpl implements ParcelService {
+public class ParcelServiceImpl implements ParcelService{
@Value("${PARCEL_KEY}")
private String PARCEL_KEY;
@@ -688,10 +685,11 @@
*/
@Override
public List<ParcelExcel> exportParcel(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) {
@@ -713,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;
@@ -725,9 +723,9 @@
*/
@Override
public List<ParcelKindExcel> exportParcelKind(ConditionVo conditionVo) {
- System.out.println("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();
@@ -784,7 +782,9 @@
}
}
//合并集合并返回
- return parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+ List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+ System.out.println("sysEndTIme = " + now());
+ return parcelKindExcels;
}
}
return null;
@@ -868,4 +868,5 @@
}
return list;
}
+
}
--
Gitblit v1.9.3