Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
xuyang
2023-12-14 16:38:45 +08:00
parent c5e31075a5
commit b0d2b611ad
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
View File

@@ -35,12 +35,6 @@ public enum GWSendEnum {
SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"), SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"),
//接收其他干扰用户台账数据接口 //接收其他干扰用户台账数据接口
OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), 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"),
; ;

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
View File

@@ -70,7 +70,7 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
param.setStats(pendingIds.get(i)); param.setStats(pendingIds.get(i));
param.setStatisticalDate(time); param.setStatisticalDate(time);
//上送数据 //上送数据
Map<String, String> send = GwSendUtil.send(param, GWSendEnum.POINT_STATISTICAL_DATA); Map<String, String> send = GwSendUtil.send(param, GWSendEnum.STATISTICAL_CREATE);
//获取返回结果 //获取返回结果
List<String> l = pendingIds.get(i).stream().map(MonitorStatisticalDTO::getId).collect(Collectors.toList()); List<String> l = pendingIds.get(i).stream().map(MonitorStatisticalDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send); returnInformation(i,l,send);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
param.setStats(l1); param.setStats(l1);
param.setStatisticalDate(time); param.setStatisticalDate(time);
//上送数据 //上送数据
Map<String, String> send = GwSendUtil.send(param, GWSendEnum.EVALUATION_DATA); Map<String, String> send = GwSendUtil.send(param, GWSendEnum.EVALUATION);
//获取返回结果 //获取返回结果
List<String> l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList()); List<String> l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send); returnInformation(i,l,send);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
View File

@@ -77,7 +77,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
param.setStats(pendingIds.get(i)); param.setStats(pendingIds.get(i));
param.setStatisticalDate(time); param.setStatisticalDate(time);
//上送数据 //上送数据
Map<String, String> send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_STATISTICAL_DATA); Map<String, String> send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR);
//获取返回结果 //获取返回结果
List<String> l = pendingIds.get(i).stream().map(SubstationQualityStatisticsDTO::getId).collect(Collectors.toList()); List<String> l = pendingIds.get(i).stream().map(SubstationQualityStatisticsDTO::getId).collect(Collectors.toList());
returnInformation(i,l,send); returnInformation(i,l,send);