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) );