From 4c4d2236a94e0039d93e3dd9b5297ed1cbb8732d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 27 Sep 2023 14:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/harmonic/pojo/po/day/RStatDataVDPO.java | 2 +- .../service/mysql/Impl/line/NormalLimitServiceImpl.java | 2 +- .../harmonic/service/mysql/Impl/line/PollutionServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 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 0ba178cf3..bf2246411 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 phaseType; + private String phasicType; @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 42bc05320..1786fce8c 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::getPhaseType)); + Map> dataVMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getPhasicType)); //电流 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 e5b47b69f..491651961 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 @@ -401,7 +401,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::getPhaseType, Arrays.asList("A", "B", "C")) + .in(RStatDataVDPO::getPhasicType, Arrays.asList("A", "B", "C")) .ge(RStatDataVDPO::getTime, beginTime) .le(RStatDataVDPO::getTime, endTime) );