From 1d41b1af12203cabc879d5226695ff41900a1ad9 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 9 Aug 2024 08:38:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/pojo/po/day/RStatDataVDPO.java | 2 +- .../Impl/line/NormalLimitServiceImpl.java | 2 +- .../mysql/Impl/line/PollutionServiceImpl.java | 2 +- .../impl/StationBusBarReportServiceImpl.java | 26 +++++++++---------- .../impl/RMpInfluenceMServiceImpl.java | 2 +- .../upload/impl/RDimBusUpDServiceImpl.java | 2 +- .../upload/impl/RDimBusUpMServiceImpl.java | 4 +-- .../upload/impl/RDimBusUpYServiceImpl.java | 4 +-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java index 6af5f01a9..afd5c8153 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java @@ -29,7 +29,7 @@ public class RStatDataVDPO implements Serializable { @MppMultiId @TableField(value = "phasic_type") - private String phasicType; + private String phaseType; @MppMultiId @TableField(value = "value_type") diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java index f5bda1b04..b1ab243a5 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java @@ -112,7 +112,7 @@ public class NormalLimitServiceImpl extends ServiceImpl lambdaQueryDataV = new LambdaQueryWrapper<>(); lambdaQueryDataV.eq(RStatDataVDPO::getLineId, lineIndex).eq(RStatDataVDPO::getTime, lineParam.getDataDate() + InfluxDBPublicParam.START_TIME); List rStatDataVDPOList = rStatDataVDMapper.selectList(lambdaQueryDataV); - Map> dataVMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getPhasicType)); + Map> dataVMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getPhaseType)); //电流 LambdaQueryWrapper lambdaQueryDataI = new LambdaQueryWrapper<>(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index 80c3d374a..b6b64d22d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -654,7 +654,7 @@ public class PollutionServiceImpl implements PollutionService { private Map> getThreePhaseData(List overLimitList,String beginTime,String endTime){ List threePhaseList = dataVDService.list(new LambdaQueryWrapper() .eq(RStatDataVDPO::getValueType, "CP95") - .in(RStatDataVDPO::getPhasicType, Arrays.asList("A", "B", "C")) + .in(RStatDataVDPO::getPhaseType, Arrays.asList("A", "B", "C")) .ge(RStatDataVDPO::getTime, beginTime) .le(RStatDataVDPO::getTime, endTime) ); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/busbar/impl/StationBusBarReportServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/busbar/impl/StationBusBarReportServiceImpl.java index 6325fc662..65169c549 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/busbar/impl/StationBusBarReportServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/busbar/impl/StationBusBarReportServiceImpl.java @@ -56,16 +56,16 @@ public class StationBusBarReportServiceImpl extends MppServiceImpl vdQuery = new LambdaQueryWrapper<>(); - vdQuery.select(RStatDataVDPO::getLineId, RStatDataVDPO::getPhasicType, RStatDataVDPO::getVThd, RStatDataVDPO::getRms, RStatDataVDPO::getValueType, RStatDataVDPO::getVUnbalance) + vdQuery.select(RStatDataVDPO::getLineId, RStatDataVDPO::getPhaseType, RStatDataVDPO::getVThd, RStatDataVDPO::getRms, RStatDataVDPO::getValueType, RStatDataVDPO::getVUnbalance) .in(RStatDataVDPO::getLineId, busBarAndHisMonitorDTO.getMonitorIds()).between(RStatDataVDPO::getTime, begin, calculatedParam.getDataDate()); List rStatDataVDPOList = irStatDataVDService.list(vdQuery); Map> vMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getValueType)); if (vMap.containsKey("MAX")) { List maxList = vMap.get("MAX"); - Double rms = maxList.stream().filter(item -> !item.getPhasicType().equals("A")).map(RStatDataVDPO::getRms).max(Comparator.comparing(Function.identity())).orElse(3.14159); - Double thd = maxList.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVThd).max(Comparator.comparing(Function.identity())).orElse(3.14159); - Double un = maxList.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVUnbalance).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double rms = maxList.stream().filter(item -> !item.getPhaseType().equals("A")).map(RStatDataVDPO::getRms).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double thd = maxList.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVThd).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double un = maxList.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVUnbalance).max(Comparator.comparing(Function.identity())).orElse(3.14159); rStatBusbarHarmonicYPO.setVEffectiveMax(rms); rStatBusbarHarmonicYPO.setVThdMax(thd); rStatBusbarHarmonicYPO.setUnbalanceMax(un); @@ -77,9 +77,9 @@ public class StationBusBarReportServiceImpl extends MppServiceImpl maxList = vMap.get("MIN"); - Double rms = maxList.stream().filter(item -> !item.getPhasicType().equals("A")).map(RStatDataVDPO::getRms).min(Comparator.comparing(Function.identity())).orElse(3.14159); - Double thd = maxList.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVThd).min(Comparator.comparing(Function.identity())).orElse(3.14159); - Double un = maxList.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVUnbalance).min(Comparator.comparing(Function.identity())).orElse(3.14159); + Double rms = maxList.stream().filter(item -> !item.getPhaseType().equals("A")).map(RStatDataVDPO::getRms).min(Comparator.comparing(Function.identity())).orElse(3.14159); + Double thd = maxList.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVThd).min(Comparator.comparing(Function.identity())).orElse(3.14159); + Double un = maxList.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVUnbalance).min(Comparator.comparing(Function.identity())).orElse(3.14159); rStatBusbarHarmonicYPO.setVEffectiveMin(rms); rStatBusbarHarmonicYPO.setVThdMin(thd); rStatBusbarHarmonicYPO.setUnbalanceMin(un); @@ -91,9 +91,9 @@ public class StationBusBarReportServiceImpl extends MppServiceImpl maxList = vMap.get("AVG"); - Double rms = maxList.stream().filter(item -> !item.getPhasicType().equals("A")).mapToDouble(RStatDataVDPO::getRms).average().orElse(3.14159); - Double thd = maxList.stream().filter(item -> item.getPhasicType().equals("A")).mapToDouble(RStatDataVDPO::getVThd).average().orElse(3.14159); - Double un = maxList.stream().filter(item -> item.getPhasicType().equals("A")).mapToDouble(RStatDataVDPO::getVUnbalance).average().orElse(3.14159); + Double rms = maxList.stream().filter(item -> !item.getPhaseType().equals("A")).mapToDouble(RStatDataVDPO::getRms).average().orElse(3.14159); + Double thd = maxList.stream().filter(item -> item.getPhaseType().equals("A")).mapToDouble(RStatDataVDPO::getVThd).average().orElse(3.14159); + Double un = maxList.stream().filter(item -> item.getPhaseType().equals("A")).mapToDouble(RStatDataVDPO::getVUnbalance).average().orElse(3.14159); rStatBusbarHarmonicYPO.setVEffectiveAvg(rms); rStatBusbarHarmonicYPO.setVThdAvg(thd); rStatBusbarHarmonicYPO.setUnbalanceAvg(un); @@ -105,9 +105,9 @@ public class StationBusBarReportServiceImpl extends MppServiceImpl cp95List = vMap.get("CP95"); - Double rms = cp95List.stream().filter(item -> !item.getPhasicType().equals("A")).map(RStatDataVDPO::getRms).max(Comparator.comparing(Function.identity())).orElse(3.14159); - Double thd = cp95List.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVThd).max(Comparator.comparing(Function.identity())).orElse(3.14159); - Double un = cp95List.stream().filter(item -> item.getPhasicType().equals("A")).map(RStatDataVDPO::getVUnbalance).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double rms = cp95List.stream().filter(item -> !item.getPhaseType().equals("A")).map(RStatDataVDPO::getRms).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double thd = cp95List.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVThd).max(Comparator.comparing(Function.identity())).orElse(3.14159); + Double un = cp95List.stream().filter(item -> item.getPhaseType().equals("A")).map(RStatDataVDPO::getVUnbalance).max(Comparator.comparing(Function.identity())).orElse(3.14159); rStatBusbarHarmonicYPO.setVEffective95(rms); rStatBusbarHarmonicYPO.setVThd95(thd); rStatBusbarHarmonicYPO.setUnbalance95(un); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceMServiceImpl.java index 9e60aa552..986454ce1 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpInfluenceMServiceImpl.java @@ -105,7 +105,7 @@ public class RMpInfluenceMServiceImpl extends MppServiceImpl dataVDPOList = dataVDService.list(new LambdaQueryWrapper() .in(RStatDataVDPO::getLineId, line) - .eq(RStatDataVDPO::getPhasicType, "T") + .eq(RStatDataVDPO::getPhaseType, "T") .eq(RStatDataVDPO::getValueType, "CP95") .ge(StrUtil.isNotBlank(jobParam.getBeginTime()), RStatDataVDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(jobParam.getBeginTime()))) .le(StrUtil.isNotBlank(jobParam.getEndTime()), RStatDataVDPO::getTime, DateUtil.endOfDay(DateUtil.parse(jobParam.getEndTime()))) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpDServiceImpl.java index c3d4ef2ef..9e03cbbfd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpDServiceImpl.java @@ -81,7 +81,7 @@ public class RDimBusUpDServiceImpl extends MppServiceImpl generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId,lineIds)); Map generatrixWireMap = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity())); - List rStatDataVDPOList = rStatDataVDMapper.selectList(new LambdaQueryWrapper().in(RStatDataVDPO::getLineId,allMonitorIds).eq(RStatDataVDPO::getTime,localDate).eq(RStatDataVDPO::getValueType,"AVG").in(RStatDataVDPO::getPhasicType, Stream.of("A","B","C").collect(Collectors.toList()))); + List rStatDataVDPOList = rStatDataVDMapper.selectList(new LambdaQueryWrapper().in(RStatDataVDPO::getLineId,allMonitorIds).eq(RStatDataVDPO::getTime,localDate).eq(RStatDataVDPO::getValueType,"AVG").in(RStatDataVDPO::getPhaseType, Stream.of("A","B","C").collect(Collectors.toList()))); Map> vMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getLineId)); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java index 387b1056d..b353102d2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java @@ -93,8 +93,8 @@ public class RDimBusUpMServiceImpl extends MppServiceImpl> vMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getLineId)); StringBuilder stringBuilder = new StringBuilder(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java index a65175a65..0c8e61176 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java @@ -93,8 +93,8 @@ public class RDimBusUpYServiceImpl extends MppServiceImpl> vMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getLineId)); StringBuilder stringBuilder = new StringBuilder();