From 1a34a3b7384d06235bcd8c29c1627f1597b3aad6 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 12 Oct 2023 09:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jbsyncdata/service/impl/BusinessServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java b/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java index 42dafc7..141d4eb 100644 --- a/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java +++ b/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java @@ -26,7 +26,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import java.util.stream.Stream; @Slf4j @Service @@ -60,23 +59,22 @@ public class BusinessServiceImpl implements IBusinessService { RestTemplateUtil restTemplateUtil = new RestTemplateUtil(); TokenResult tokenWithRestTemplate = tokenComponent.getTokenWithRestTemplate(); if (null == tokenWithRestTemplate) { - log.error("token信息没有获取到"); + log.error("token信息获取失败"); return; } JSONObject jsonObject; JSONObject jsonObjectSub; - //将发电客户编号按500尺寸分片 + //将发电用户编号按500尺寸分片 List> partitionList = ListUtils.partition(excelDataList, 500); for (List excelData : partitionList) { Map>> typeData = new HashMap<>(); - //按批次处理客户编号数据 jsonObject = JSONUtil.createObj(); jsonObjectSub = JSONUtil.createObj(); jsonObject.set("page", 1); jsonObject.set("perPage", 10000); jsonObject.set("startTime", startTime); jsonObject.set("endTime", endTime); - //处理客户编号 + //按批次处理用户编号数据 List generationUserIDList = excelData.stream().map(t -> "160".concat(t.getGenerationUserID())).collect(Collectors.toList()); jsonObjectSub.set("consNos", generationUserIDList); //1公专变2低压用户3光伏 @@ -110,7 +108,7 @@ public class BusinessServiceImpl implements IBusinessService { userIdConcatMeasType.addAll(temp); } //处理各个record的数据，因用户下可能有多个测量点，按指标循环，默认采用第一个匹配上的做数据处理 - for (CommonTelemetry commonTelemetry : records) { + for (CommonTelemetry commonTelemetry : records) { // 最多循环500*16次 String dataIdentify = commonTelemetry.getConsNo().concat(StrPool.AT).concat(commonTelemetry.getMeasTypeCode()); if (userIdConcatMeasType.contains(dataIdentify)) { //首个包含该标识的数据进行处理