From 2e67d0c96889640a7bfb03c0530cae7285e2c555 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 15 Dec 2023 15:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConverterDetailStatisticsController.java | 9 ++-- .../ConverterIndexStatisticsController.java | 9 ++-- .../send/PqTypicalSourceCreateController.java | 7 +-- .../ConverterDetailStatisticsPOService.java | 5 +- .../ConverterIndexStatisticsPOService.java | 5 +- .../send/PqTypicalSourceCreatePOService.java | 5 +- ...onverterDetailStatisticsPOServiceImpl.java | 48 ++++++++++++------ ...ConverterIndexStatisticsPOServiceImpl.java | 49 +++++++++++++------ .../PqTypicalSourceCreatePOServiceImpl.java | 48 +++++++++++++----- 9 files changed, 122 insertions(+), 63 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java index 973bf5337..5f2d28bfb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService; import com.njcn.web.controller.BaseController; @@ -22,8 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** *需求： * * FWJK-PMS3.0-TC0013-电能质量管理两级贯通接口V1.10 @@ -58,10 +57,10 @@ public class ConverterDetailStatisticsController extends BaseController { @PostMapping("send") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("上报") - @ApiImplicitParam(name = "ids",value = "请求体",required = true) - public HttpResult send(@RequestBody List ids){ + @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true) + public HttpResult send(@RequestBody UploadParam uploadParam){ String methodDescribe = getMethodDescribe("send"); - String s = converterDetailStatisticsPOService.send(ids); + String s = converterDetailStatisticsPOService.send(uploadParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java index 03ea91fd9..fd43fc32b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService; import com.njcn.web.controller.BaseController; @@ -22,8 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * Description:河北国网上送接口 * *2.4.1.18 接收电能质量换流站指标汇总统计数据接口 @@ -54,10 +53,10 @@ public class ConverterIndexStatisticsController extends BaseController { @PostMapping("send") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("上报") - @ApiImplicitParam(name = "ids",value = "请求体",required = true) - public HttpResult send(@RequestBody List ids){ + @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true) + public HttpResult send( @RequestBody UploadParam uploadParam){ String methodDescribe = getMethodDescribe("send"); - String s = converterIndexStatisticsPOService.send(ids); + String s = converterIndexStatisticsPOService.send(uploadParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java index fba179760..b5a4a8a80 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService; import com.njcn.web.controller.BaseController; @@ -54,10 +55,10 @@ public class PqTypicalSourceCreateController extends BaseController { @PostMapping("send") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("上报") - @ApiImplicitParam(name = "ids",value = "请求体",required = true) - public HttpResult send(@RequestBody List ids){ + @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true) + public HttpResult send(@RequestBody UploadParam uploadParam){ String methodDescribe = getMethodDescribe("send"); - String s = pqTypicalSourceCreatePOService.send(ids); + String s = pqTypicalSourceCreatePOService.send(uploadParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java index 0a08950dc..4b3c5dbfc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java @@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; -import java.util.List; - /** * * Description: @@ -20,5 +19,5 @@ public interface ConverterDetailStatisticsPOService extends IService queryPage(SendQueryParam.SendPageParam param); - String send(List ids); + String send(UploadParam uploadParam); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java index 1a3e653f7..a0b340ab4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java @@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; -import java.util.List; - /** * * Description: @@ -20,5 +19,5 @@ public interface ConverterIndexStatisticsPOService extends IService queryPage(SendQueryParam.SendPageParam param); - String send(List ids); + String send(UploadParam uploadParam); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java index 1859e3220..743319de9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java @@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; -import java.util.List; - /** * * Description: @@ -20,5 +19,5 @@ public interface PqTypicalSourceCreatePOService extends IService queryPage(SendQueryParam.SendPageParam param); - String send(List ids); + String send(UploadParam uploadParam); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java index a53f5ff9e..6a8a27473 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.send.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.send.ConverterDetailStatisticsPOMapper; import com.njcn.harmonic.pojo.dto.ConverterDetailStatisticsDTO; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService; import com.njcn.user.api.DeptFeignClient; @@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam; import com.njcn.web.utils.GwSendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -55,23 +58,40 @@ public class ConverterDetailStatisticsPOServiceImpl extends ServiceImpl ids) { + public String send(UploadParam param) { - List list = this.lambdaQuery().eq(ConverterDetailStatisticsPO::getId, ids).list(); - - if (list.size() > 100) { - throw new BusinessException("一次最多上送100条数据"); + List list; + //指定数据上送,不管之前有没有上送,都重新上送一次 + //(预防之前送上过,修改数据后需要再次上送) + if (CollectionUtil.isNotEmpty(param.getList())){ + list = this.lambdaQuery() + .eq(ConverterDetailStatisticsPO::getStatisticalDate,param.getTime()) + .in(ConverterDetailStatisticsPO::getId,param.getList()) + .list(); } - List converterDetailStatisticsDTOList = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class); - SendParam param = new SendParam(); - param.setStats(converterDetailStatisticsDTOList); - String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); - log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); - Map send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR); - log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); + //未指定数据上送,则将所有未上送的数据,上送上去 + else { + list = this.lambdaQuery() + .eq(ConverterDetailStatisticsPO::getStatisticalDate,param.getTime()) + .eq(ConverterDetailStatisticsPO::getIsUploadHead,0) + .list(); + } + List dtoList = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class); + //以尺寸100分片 + List> pendingIds = ListUtils.partition(dtoList, 100); + pendingIds.forEach(temp->{ + SendParam sendParam = new SendParam(); + sendParam.setStats(temp); + String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); + log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); + Map send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR); + log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); - List trIds = converterDetailStatisticsDTOList.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList()); - return returnInformation(1, trIds, send); + List trIds = temp.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList()); + returnInformation(1, trIds, send); + }); + + return "成功"; } /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java index 4be9b2a4f..103669d8d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.send.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.send.ConverterIndexStatisticsPOMapper; import com.njcn.harmonic.pojo.dto.ConverterIndexStatisticsDTO; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService; import com.njcn.user.api.DeptFeignClient; @@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam; import com.njcn.web.utils.GwSendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -52,22 +55,40 @@ public class ConverterIndexStatisticsPOServiceImpl extends ServiceImpl ids) { - List list = this.lambdaQuery().eq(ConverterIndexStatisticsPO::getId, ids).list(); - - if (list.size() > 100) { - throw new BusinessException("一次最多上送100条数据"); + public String send(UploadParam uploadParam) { + List list; + //指定数据上送,不管之前有没有上送,都重新上送一次 + //(预防之前送上过,修改数据后需要再次上送) + if (CollectionUtil.isNotEmpty(uploadParam.getList())){ + list = this.lambdaQuery() + .eq(ConverterIndexStatisticsPO::getStatisticalDate,uploadParam.getTime()) + .in(ConverterIndexStatisticsPO::getId,uploadParam.getList()) + .list(); } - List converterIndexStatisticsDTOS = BeanUtil.copyToList(list, ConverterIndexStatisticsDTO.class); - SendParam param = new SendParam(); - param.setStats(converterIndexStatisticsDTOS); - String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); - log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); - Map send = GwSendUtil.send(param, GWSendEnum.DETAIL_CREATE); - log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); + //未指定数据上送,则将所有未上送的数据,上送上去 + else { + list = this.lambdaQuery() + .eq(ConverterIndexStatisticsPO::getStatisticalDate,uploadParam.getTime()) + .eq(ConverterIndexStatisticsPO::getIsUploadHead,0) + .list(); + } + List dtoList = BeanUtil.copyToList(list, ConverterIndexStatisticsDTO.class); + //以尺寸100分片 + List> pendingIds = ListUtils.partition(dtoList, 100); + pendingIds.forEach(temp->{ + SendParam sendParam = new SendParam(); + sendParam.setStats(temp); + String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT); + log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); + Map send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR); + log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); + + List trIds = temp.stream().map(ConverterIndexStatisticsDTO::getId).distinct().collect(Collectors.toList()); + returnInformation(1, trIds, send); + }); + + return "成功"; - List trIds = converterIndexStatisticsDTOS.stream().map(ConverterIndexStatisticsDTO::getId).distinct().collect(Collectors.toList()); - return returnInformation(1, trIds, send); } /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java index e861246aa..15e878b6c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.send.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.send.PqTypicalSourceCreatePOMapper; import com.njcn.harmonic.pojo.dto.PqTypicalSourceCreateDTO; import com.njcn.harmonic.pojo.param.SendQueryParam; +import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService; import com.njcn.user.api.DeptFeignClient; @@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam; import com.njcn.web.utils.GwSendUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -53,22 +56,41 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl ids) { - List list = this.lambdaQuery().eq(PqTypicalSourceCreatePO::getId, ids).list(); + public String send(UploadParam uploadParam) { - if (list.size() > 100) { - throw new BusinessException("一次最多上送100条数据"); + List list; + //指定数据上送,不管之前有没有上送,都重新上送一次 + //(预防之前送上过,修改数据后需要再次上送) + if (CollectionUtil.isNotEmpty(uploadParam.getList())){ + list = this.lambdaQuery() + .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime()) + .in(PqTypicalSourceCreatePO::getId,uploadParam.getList()) + .list(); } - List pqTypicalSourceCreateDTOList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class); - SendParam param = new SendParam(); - param.setStats(pqTypicalSourceCreateDTOList); - String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); - log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); - Map send = GwSendUtil.send(param, GWSendEnum.TYPICAL_SOURCE); - log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); + //未指定数据上送,则将所有未上送的数据,上送上去 + else { + list = this.lambdaQuery() + .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime()) + .eq(PqTypicalSourceCreatePO::getIsUploadHead,0) + .list(); + } + List dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class); + //以尺寸100分片 + List> pendingIds = ListUtils.partition(dtoList, 100); + pendingIds.forEach(temp->{ + SendParam sendParam = new SendParam(); + sendParam.setStats(temp); + String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT); + log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); + Map send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR); + log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); + + List trIds = temp.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList()); + returnInformation(1, trIds, send); + }); + + return "成功"; - List trIds = pqTypicalSourceCreateDTOList.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList()); - return returnInformation(1, trIds, send); } /**