From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 15:24:42 +0800
Subject: [PATCH] 1.设备故障状态合并到设备状态中,设备状态接口修改 2.警情处理完成后修改设备状态为正常,修改警情处理接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 da4f6ab..b164fcd 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
@@ -687,16 +687,16 @@
 		List<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
 		//设置页码数
 		conditionVo.setCurrentPage(1);
-		conditionVo.setPageSize(100);
+		conditionVo.setPageSize(1000);
 		//获取数据
 		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);

--
Gitblit v1.9.3