From b0d2b611ad22d1082c52bb4ab9e662a1c4697d43 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 14 Dec 2023 16:38:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/web/enums/GWSendEnum.java | 6 ------ .../upload/impl/PointStatisticalDataServiceImpl.java | 2 +- .../service/upload/impl/REvaluationDataServiceImpl.java | 2 +- .../upload/impl/RSubstationStatisticalDataServiceImpl.java | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java index d5b66ab4a..2b8ea1496 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java @@ -35,12 +35,6 @@ public enum GWSendEnum { SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"), //接收其他干扰用户台账数据接口 OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), - //2.4.1.16接收电能质量主配网监测点统计数据接口 - POINT_STATISTICAL_DATA("pqPointStatisticalDataCreate","/WMCenter/powerQuality/converterMonitor/indexCreate"), - //2.4.1.19接收电能质量变电站监测统计数据接口 - SUBSTATION_STATISTICAL_DATA("pqSubstationStatisticalDataCreate","/WMCenter/powerQuality/substationMonitor/create"), - //2.4.1.8接收电能质量基准水平评估数据接口 - EVALUATION_DATA("pqEvaluationData","/WMCenter/powerQuality/evaluation/create"), ; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java index 93e36728e..eeb8e18c1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java @@ -70,7 +70,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl send = GwSendUtil.send(param, GWSendEnum.POINT_STATISTICAL_DATA); + Map send = GwSendUtil.send(param, GWSendEnum.STATISTICAL_CREATE); //获取返回结果 List l = pendingIds.get(i).stream().map(MonitorStatisticalDTO::getId).collect(Collectors.toList()); returnInformation(i,l,send); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index 989334af1..360cddeda 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -86,7 +86,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl send = GwSendUtil.send(param, GWSendEnum.EVALUATION_DATA); + Map send = GwSendUtil.send(param, GWSendEnum.EVALUATION); //获取返回结果 List l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList()); returnInformation(i,l,send); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java index b73c0b175..b80a3281d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java @@ -77,7 +77,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_STATISTICAL_DATA); + Map send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR); //获取返回结果 List l = pendingIds.get(i).stream().map(SubstationQualityStatisticsDTO::getId).collect(Collectors.toList()); returnInformation(i,l,send);