From 5f7ccf837b3c2ed376d26be9ad27a3ed232da96d Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 13 Oct 2023 14:46:47 +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 --- .../controller/DisPhotovoltaicController.java | 36 +++---------------- .../mapper/PmsPowerGenerationUserMapper.java | 3 ++ .../mapping/PmsPowerGenerationUserMapper.xml | 6 ++++ .../jbsyncdata/service/IBusinessService.java | 2 +- .../IPmsPowerGenerationUserService.java | 7 ++++ .../service/impl/BusinessServiceImpl.java | 16 +++++---- .../PmsPowerGenerationUserServiceImpl.java | 7 ++++ 7 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java index 20396ce..8ce9ed2 100644 --- a/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java +++ b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java @@ -37,38 +37,10 @@ public class DisPhotovoltaicController { private final IBusinessService businessService; private final DisPhotovoltaicService disPhotovoltaicService; - @ApiOperation(value = "获取10kv分布式光伏接入情况") - @PostMapping("/import10") - public void importTakeOrder(MultipartFile file, String startTime, String endTime) throws Exception { - List list = EasyExcel.read(file.getInputStream()) - .head(ExcelData.class) - .headRowNumber(2) - .sheet(2).doReadSync(); - //排重 - list = list.stream() - .filter(t -> StrUtil.isNotBlank(t.getGenerationUserID())) - .filter(StreamUtil.distinctByKey(ExcelData::getGenerationUserID)) - .collect(Collectors.toList()); - businessService.testInterfaceByUserId(list, startTime, endTime); - System.out.println(); - - } - - @ApiOperation(value = "获取380kv分布式光伏接入情况") - @PostMapping("/import380") - public void import380(MultipartFile file, String startTime, String endTime) throws Exception { - List list = EasyExcel.read(file.getInputStream()) - .head(ExcelData.class) - .headRowNumber(2) - .sheet(3).doReadSync(); - //排重 - list = list.stream() - .filter(t -> StrUtil.isNotBlank(t.getGenerationUserID())) - .filter(StreamUtil.distinctByKey(ExcelData::getGenerationUserID)) - .collect(Collectors.toList()); - businessService.testInterfaceByUserId(list, startTime, endTime); - System.out.println(); - + @ApiOperation(value = "查询所有用户的遥测数据") + @PostMapping("/queryTelemetryData") + public void queryTelemetryData(String startTime, String endTime) { + businessService.queryTelemetryData(startTime, endTime); } @ApiOperation(value = "导入10kv分布式光伏接入情况", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) diff --git a/src/main/java/com/njcn/jbsyncdata/mapper/PmsPowerGenerationUserMapper.java b/src/main/java/com/njcn/jbsyncdata/mapper/PmsPowerGenerationUserMapper.java index d05c7c8..7ebc4ea 100644 --- a/src/main/java/com/njcn/jbsyncdata/mapper/PmsPowerGenerationUserMapper.java +++ b/src/main/java/com/njcn/jbsyncdata/mapper/PmsPowerGenerationUserMapper.java @@ -3,6 +3,8 @@ package com.njcn.jbsyncdata.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.jbsyncdata.pojo.PmsPowerGenerationUser; +import java.util.List; + /** *

@@ -15,4 +17,5 @@ import com.njcn.jbsyncdata.pojo.PmsPowerGenerationUser; public interface PmsPowerGenerationUserMapper extends MppBaseMapper { + List queryAllUserId(); } diff --git a/src/main/java/com/njcn/jbsyncdata/mapper/mapping/PmsPowerGenerationUserMapper.xml b/src/main/java/com/njcn/jbsyncdata/mapper/mapping/PmsPowerGenerationUserMapper.xml index f366706..36cb2a5 100644 --- a/src/main/java/com/njcn/jbsyncdata/mapper/mapping/PmsPowerGenerationUserMapper.xml +++ b/src/main/java/com/njcn/jbsyncdata/mapper/mapping/PmsPowerGenerationUserMapper.xml @@ -2,5 +2,11 @@ + diff --git a/src/main/java/com/njcn/jbsyncdata/service/IBusinessService.java b/src/main/java/com/njcn/jbsyncdata/service/IBusinessService.java index ac8dba3..8b0ad4a 100644 --- a/src/main/java/com/njcn/jbsyncdata/service/IBusinessService.java +++ b/src/main/java/com/njcn/jbsyncdata/service/IBusinessService.java @@ -6,6 +6,6 @@ import java.util.List; public interface IBusinessService { - void testInterfaceByUserId(List list,String startTime,String endTime); + void queryTelemetryData(String startTime,String endTime); } diff --git a/src/main/java/com/njcn/jbsyncdata/service/IPmsPowerGenerationUserService.java b/src/main/java/com/njcn/jbsyncdata/service/IPmsPowerGenerationUserService.java index 6feed83..af97e11 100644 --- a/src/main/java/com/njcn/jbsyncdata/service/IPmsPowerGenerationUserService.java +++ b/src/main/java/com/njcn/jbsyncdata/service/IPmsPowerGenerationUserService.java @@ -3,6 +3,8 @@ package com.njcn.jbsyncdata.service; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.jbsyncdata.pojo.PmsPowerGenerationUser; +import java.util.List; + /** *

* 发电用户台账 服务类 @@ -13,4 +15,9 @@ import com.njcn.jbsyncdata.pojo.PmsPowerGenerationUser; */ public interface IPmsPowerGenerationUserService extends IMppService { + /** + * 查询所有客户编号 + * @return + */ + List queryAllUserId(); } 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 141d4eb..26fa376 100644 --- a/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java +++ b/src/main/java/com/njcn/jbsyncdata/service/impl/BusinessServiceImpl.java @@ -13,6 +13,7 @@ import com.njcn.jbsyncdata.enums.MeasTypeEnum; import com.njcn.jbsyncdata.pojo.ExcelData; import com.njcn.jbsyncdata.pojo.result.*; import com.njcn.jbsyncdata.service.IBusinessService; +import com.njcn.jbsyncdata.service.IPmsPowerGenerationUserService; import com.njcn.jbsyncdata.util.RestTemplateUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; @@ -38,6 +39,9 @@ public class BusinessServiceImpl implements IBusinessService { @Resource private InfluxDbUtils influxDbUtils; + @Resource + private IPmsPowerGenerationUserService pmsPowerGenerationUserService; + /** * 此方法通过发电客户编号查询数据，该方法存在以下问题 * 问题一：一个发电客户编号同指标返回的数据会有多个，但是目前看到最多2个测量点数据。 @@ -51,11 +55,9 @@ public class BusinessServiceImpl implements IBusinessService { * 2. PageResult的records属性为null---------------------不做处理，直接过 * 3. CommonTelemetry的遥测数据集合telemetryValue为null--不做处理，直接过 * 4. StatisticsData统计数据的实际数值measValue为null-----对应时间、指标的数值设置为0 - * - * @param excelDataList 客户编号集合 */ @Override - public void testInterfaceByUserId(List excelDataList, String startTime, String endTime) { + public void queryTelemetryData(String startTime, String endTime) { RestTemplateUtil restTemplateUtil = new RestTemplateUtil(); TokenResult tokenWithRestTemplate = tokenComponent.getTokenWithRestTemplate(); if (null == tokenWithRestTemplate) { @@ -64,9 +66,11 @@ public class BusinessServiceImpl implements IBusinessService { } JSONObject jsonObject; JSONObject jsonObjectSub; + //获取所有发电用户的id + List userIds = pmsPowerGenerationUserService.queryAllUserId(); //将发电用户编号按500尺寸分片 - List> partitionList = ListUtils.partition(excelDataList, 500); - for (List excelData : partitionList) { + List> partitionList = ListUtils.partition(userIds, 500); + for (List userId : partitionList) { Map>> typeData = new HashMap<>(); jsonObject = JSONUtil.createObj(); jsonObjectSub = JSONUtil.createObj(); @@ -75,7 +79,7 @@ public class BusinessServiceImpl implements IBusinessService { jsonObject.set("startTime", startTime); jsonObject.set("endTime", endTime); //按批次处理用户编号数据 - List generationUserIDList = excelData.stream().map(t -> "160".concat(t.getGenerationUserID())).collect(Collectors.toList()); + List generationUserIDList = userId.stream().map("160"::concat).collect(Collectors.toList()); jsonObjectSub.set("consNos", generationUserIDList); //1公专变2低压用户3光伏 jsonObjectSub.set("consType", 3); diff --git a/src/main/java/com/njcn/jbsyncdata/service/impl/PmsPowerGenerationUserServiceImpl.java b/src/main/java/com/njcn/jbsyncdata/service/impl/PmsPowerGenerationUserServiceImpl.java index fe5ff8e..bd21218 100644 --- a/src/main/java/com/njcn/jbsyncdata/service/impl/PmsPowerGenerationUserServiceImpl.java +++ b/src/main/java/com/njcn/jbsyncdata/service/impl/PmsPowerGenerationUserServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.jbsyncdata.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.jbsyncdata.mapper.PmsPowerGenerationUserMapper; import com.njcn.jbsyncdata.pojo.PmsPowerGenerationUser; @@ -7,6 +8,8 @@ import com.njcn.jbsyncdata.service.IPmsPowerGenerationUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 发电用户台账 服务实现类 @@ -19,4 +22,8 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class PmsPowerGenerationUserServiceImpl extends MppServiceImpl implements IPmsPowerGenerationUserService { + @Override + public List queryAllUserId() { + return this.baseMapper.queryAllUserId(); + } }