From e12e5d90c84e8ed1e57fe80441a7462a4778c90e Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 10 Jul 2024 09:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9influxdb=E5=8C=85=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=B1=BB=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CarryCapcityServiceImpl.java | 4 ++-- .../impl/HistoryResultServiceImpl.java | 4 ++-- .../mysql/Impl/line/DayDataServiceImpl.java | 10 ++++---- .../mysql/Impl/line/IntegrityServiceImpl.java | 2 +- .../mysql/Impl/line/LimitRateServiceImpl.java | 24 +++++++++---------- .../src/test/java/com/njcn/BaseJunitTest.java | 17 ++++--------- .../device/impl/LineWarningServiceImpl.java | 12 +++++----- 7 files changed, 32 insertions(+), 41 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java index ea6f7f4e2..660404748 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java @@ -31,7 +31,7 @@ import com.njcn.influx.deprecated.InfluxDBPublicParam; import com.njcn.influx.imapper.DataHarmPowerPMapper; import com.njcn.influx.imapper.DataHarmPowerQMapper; import com.njcn.influx.imapper.DataVMapper; -import com.njcn.influx.imapper.IDataIMapper; +import com.njcn.influx.imapper.DataIMapper; import com.njcn.influx.pojo.bo.CarryCapcityData; import com.njcn.influx.pojo.po.DataI; import com.njcn.oss.constant.OssPath; @@ -74,7 +74,7 @@ public class CarryCapcityServiceImpl implements CarryCapcityService { private final DataHarmPowerQMapper dataHarmPowerQMapper; private final DataHarmPowerPMapper dataHarmPowerPMapper; private final DataVMapper dataVMapper; - private final IDataIMapper dataIMapper; + private final DataIMapper dataIMapper; private final CarryCapacityStrategyPOService carryCapacityStrategyPOService; private final CarryCapacityDataPOService carryCapacityDataPOService; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java index fd748a580..cc7d4db2e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java @@ -31,7 +31,7 @@ import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO; import com.njcn.harmonic.service.HistoryResultService; import com.njcn.influx.imapper.CommonMapper; import com.njcn.influx.imapper.DataHarmRateVMapper; -import com.njcn.influx.imapper.IDataIMapper; +import com.njcn.influx.imapper.DataIMapper; import com.njcn.influx.pojo.bo.HarmonicHistoryData; import com.njcn.influx.pojo.constant.InfluxDBTableConstant; import com.njcn.influx.pojo.dto.HarmData; @@ -82,7 +82,7 @@ public class HistoryResultServiceImpl implements HistoryResultService { private final CommonMapper commonMapper; - private final IDataIMapper dataIMapper; + private final DataIMapper dataIMapper; private final DataHarmRateVMapper dataHarmRateVMapper; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index 92e851c1f..077ffd7bf 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -75,7 +75,7 @@ public class DayDataServiceImpl implements DayDataService { private final DayInHarmVMapper dayInHarmVMapper; //new private final DataVMapper dataVMapper; - private final IDataIMapper dataIMapper; + private final DataIMapper dataIMapper; private final DataFlickerMapper dataFlickerMapper; private final DataFlucMapper dataFlucMapper; private final DataHarmPhasicIMapper dataHarmPhasicIMapper; @@ -968,7 +968,7 @@ public class DayDataServiceImpl implements DayDataService { .min(DataV::getVZero) .min(DataV::getVlDev) .min(DataV::getVuDev) - .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType) + .groupBy(DataV::getLineId,DataV::getPhaseType,DataV::getQualityFlag,DataV::getValueType) .between(DataV::getTime, startTime, endTime); List result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper); result.addAll(result1); @@ -988,7 +988,7 @@ public class DayDataServiceImpl implements DayDataService { .max(DataV::getVZero) .max(DataV::getVlDev) .max(DataV::getVuDev) - .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType) + .groupBy(DataV::getLineId,DataV::getPhaseType,DataV::getQualityFlag,DataV::getValueType) .between(DataV::getTime, startTime, endTime); List result2 = dataVMapper.getStatisticsByWraper(influxQueryWrapper2); result.addAll(result2); @@ -1008,7 +1008,7 @@ public class DayDataServiceImpl implements DayDataService { .mean(DataV::getVZero) .mean(DataV::getVlDev) .mean(DataV::getVuDev) - .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType) + .groupBy(DataV::getLineId,DataV::getPhaseType,DataV::getQualityFlag,DataV::getValueType) .between(DataV::getTime, startTime, endTime); List result3 = dataVMapper.getStatisticsByWraper(influxQueryWrapper3); result.addAll(result3); @@ -1028,7 +1028,7 @@ public class DayDataServiceImpl implements DayDataService { .percentile(DataV::getVZero,95) .percentile(DataV::getVlDev,95) .percentile(DataV::getVuDev,95) - .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType) + .groupBy(DataV::getLineId,DataV::getPhaseType,DataV::getQualityFlag,DataV::getValueType) .between(DataV::getTime, startTime, endTime); List result4 = dataVMapper.getStatisticsByWraper(influxQueryWrapper4); result4.forEach(item->{ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index ba4fe9e2e..8fcfd835c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -143,7 +143,7 @@ public class IntegrityServiceImpl extends MppServiceImpl getDataVThd(List lineIndex, String startTime, String endTime) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); influxQueryWrapper.select(DataV::getLineId) - .select(DataV::getPhasicType) + .select(DataV::getPhaseType) .select(DataV::getQualityFlag) .select(DataV::getValueType) .select(DataV::getVThd) .regular(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.CP95) - .regular(DataV::getPhasicType, Arrays.asList(InfluxDBTableConstant.PHASE_TYPE_A,InfluxDBTableConstant.PHASE_TYPE_B,InfluxDBTableConstant.PHASE_TYPE_C)) + .regular(DataV::getPhaseType, Arrays.asList(InfluxDBTableConstant.PHASE_TYPE_A,InfluxDBTableConstant.PHASE_TYPE_B,InfluxDBTableConstant.PHASE_TYPE_C)) .eq(DataV::getQualityFlag, InfluxDBTableConstant.NORMAL) .between(DataV::getTime, startTime, endTime); return dataVMapper.getStatisticsByWraper(influxQueryWrapper); @@ -457,13 +457,13 @@ public class LimitRateServiceImpl extends MppServiceImpl getDataVUnbalance(List lineIndex, String startTime, String endTime) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); influxQueryWrapper.select(DataV::getLineId) - .select(DataV::getPhasicType) + .select(DataV::getPhaseType) .select(DataV::getQualityFlag) .select(DataV::getValueType) .select(DataV::getVUnbalance) .regular(DataV::getLineId, lineIndex) .regular(DataV::getValueType, Arrays.asList(InfluxDbSqlConstant.CP95,InfluxDbSqlConstant.MAX)) - .eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + .eq(DataV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T) .eq(DataV::getQualityFlag, InfluxDBTableConstant.NORMAL) .between(DataV::getTime, startTime, endTime); return dataVMapper.getStatisticsByWraper(influxQueryWrapper); @@ -505,13 +505,13 @@ public class LimitRateServiceImpl extends MppServiceImpl getDataVFreq(List lineIndex, String startTime, String endTime) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); influxQueryWrapper.select(DataV::getLineId) - .select(DataV::getPhasicType) + .select(DataV::getPhaseType) .select(DataV::getQualityFlag) .select(DataV::getValueType) .select(DataV::getFreqDev) .regular(DataV::getLineId, lineIndex) .regular(DataV::getValueType, Arrays.asList(InfluxDbSqlConstant.MIN,InfluxDbSqlConstant.MAX)) - .eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + .eq(DataV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_T) .eq(DataV::getQualityFlag, InfluxDBTableConstant.NORMAL) .between(DataV::getTime, startTime, endTime); return dataVMapper.getStatisticsByWraper(influxQueryWrapper); @@ -529,13 +529,13 @@ public class LimitRateServiceImpl extends MppServiceImpl getDataVDev(List lineIndex, String startTime, String endTime) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); influxQueryWrapper.select(DataV::getLineId) - .select(DataV::getPhasicType) + .select(DataV::getPhaseType) .select(DataV::getQualityFlag) .select(DataV::getValueType) .select(DataV::getVlDev) .select(DataV::getVuDev).regular(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX) - .regular(DataV::getPhasicType, Arrays.asList(InfluxDBTableConstant.PHASE_TYPE_A,InfluxDBTableConstant.PHASE_TYPE_B,InfluxDBTableConstant.PHASE_TYPE_C)) + .regular(DataV::getPhaseType, Arrays.asList(InfluxDBTableConstant.PHASE_TYPE_A,InfluxDBTableConstant.PHASE_TYPE_B,InfluxDBTableConstant.PHASE_TYPE_C)) .eq(DataV::getQualityFlag, InfluxDBTableConstant.NORMAL) .between(DataV::getTime, startTime, endTime); return dataVMapper.getStatisticsByWraper(influxQueryWrapper); @@ -616,7 +616,7 @@ public class LimitRateServiceImpl extends MppServiceImpl list = dataVMapper.getStatisticsByWraper(influxQueryWrapper); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java index 39f1ea11d..5917c3bab 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java @@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper)); InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class); influxQueryWrapper2.eq(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX) - .regular(DataV::getPhasicType,Arrays.asList("A","B","C")) + .regular(DataV::getPhaseType,Arrays.asList("A","B","C")) .max(DataV::getVuDev) .between(DataV::getTime, startTime, endTime); result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2)); @@ -832,7 +832,7 @@ public class LineWarningServiceImpl extends MppServiceImpl