diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java index 1b43b80..da21b90 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java @@ -200,7 +200,7 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmrateI::getLineId, lineList) .select(DataHarmrateI::getLineId) .select(DataHarmrateI::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java index 71768e3..5426f61 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java @@ -238,7 +238,7 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl getGroupByTimeHarmRateV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper harmRateVQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); - harmRateVQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); + harmRateVQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); harmRateVQueryWrapper.regular(DataV::getLineId, lineParam.getLineId()) .eq(DataHarmrateV::getValueType, InfluxDbSqlConstant.CP95) .ne(DataHarmrateV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) @@ -266,7 +266,7 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmrateV::getLineId, lineParam.getLineId()) .select(DataHarmrateV::getLineId) .select(DataHarmrateV::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java index 81ec48d..741437e 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java @@ -224,7 +224,7 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmphasicI::getLineId, lineList) .select(DataHarmphasicI::getLineId) .select(DataHarmphasicI::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java index 0d30979..456c44d 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java @@ -229,7 +229,7 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmphasicV::getLineId, lineList) .select(DataHarmphasicV::getLineId) .select(DataHarmphasicV::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java index 9790d08..c0dc068 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java @@ -233,7 +233,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, InfluxDbSqlConstant.P, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerP::getLineId, lineList) .select(DataHarmpowerP::getLineId) .select(DataHarmpowerP::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java index bbc0568..a59d3d9 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java @@ -227,7 +227,7 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, InfluxDbSqlConstant.Q, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerQ::getLineId, lineList) .select(DataHarmpowerQ::getLineId) .select(DataHarmpowerQ::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java index 74ac25a..2c4707d 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java @@ -227,7 +227,7 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, InfluxDbSqlConstant.S, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerS::getLineId, lineList) .select(DataHarmpowerS::getLineId) .select(DataHarmpowerS::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java index c040535..bae4b58 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java @@ -232,7 +232,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl getGroupByTimeDataI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); - influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); + influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); influxQueryWrapper.regular(DataI::getLineId, lineParam.getLineId()) .eq(DataI::getValueType, InfluxDbSqlConstant.CP95) .ne(DataI::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) @@ -260,7 +260,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataI::getLineId, lineParam.getLineId()) .select(DataI::getLineId) .select(DataI::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java index 88a0762..87c5b15 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java @@ -224,7 +224,7 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataInharmI::getLineId, lineList) .select(DataInharmI::getLineId) .select(DataInharmI::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java index ff93711..a7e0e3a 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java @@ -227,7 +227,7 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl dataList; List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataInharmV::getLineId, lineParam.getLineId()) .select(DataInharmV::getLineId) .select(DataInharmV::getPhasicType) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java index e42530f..2cf3a23 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java @@ -158,7 +158,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl listDataHarmrateI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmrateI::getLineId) .select(DataHarmrateI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java index 33d6e90..261ec18 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmRateVImpl.java @@ -31,7 +31,7 @@ public class InsertDataHarmRateVImpl implements InsertIDataHarmRateV { @Override public List listDataHarmrateV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmrateV::getLineId) .select(DataHarmrateV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java index d8c804d..df401cf 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicIImpl.java @@ -37,7 +37,7 @@ public class InsertDataHarmphasicIImpl implements InsertIDataHarmphasicI { public List listDataHarmphasicI(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmphasicI::getLineId) .select(DataHarmphasicI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java index c6bf042..3488639 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmphasicVImpl.java @@ -36,7 +36,7 @@ public class InsertDataHarmphasicVImpl implements InsertIDataHarmphasicV { @Override public List listDataHarmphasicV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmphasicV::getLineId) .select(DataHarmphasicV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java index 838cc40..dd1321e 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerPImpl.java @@ -36,7 +36,7 @@ public class InsertDataHarmpowerPImpl implements InsertIDataHarmpowerP { @Override public List listDataHarmpowerP(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, InfluxDbSqlConstant.P, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerP::getLineId) .select(DataHarmpowerP::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java index 89ed7a1..91a5662 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerQImpl.java @@ -35,7 +35,7 @@ public class InsertDataHarmpowerQImpl implements InsertIDataHarmpowerQ { @Override public List listDataHarmpowerQ(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, InfluxDbSqlConstant.Q, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerQ::getLineId) .select(DataHarmpowerQ::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java index 7e6f982..cd374d1 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataHarmpowerSImpl.java @@ -35,7 +35,7 @@ public class InsertDataHarmpowerSImpl implements InsertIDataHarmpowerS { @Override public List listDataHarmpowerS(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, InfluxDbSqlConstant.S, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerS::getLineId) .select(DataHarmpowerS::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java index 49cfcd0..ac190be 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataIImpl.java @@ -36,7 +36,7 @@ public class InsertDataIImpl implements InsertIDataI { @Override public List listDataI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataI::getLineId) .select(DataI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java index ab4fedb..b3ce85f 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmIImpl.java @@ -35,7 +35,7 @@ public class InsertDataInharmIImpl implements InsertIDataInharmI { @Override public List listDataInharmI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataInharmI::getLineId) .select(DataInharmI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java index 12cccd6..f51302e 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataInharmVImpl.java @@ -35,7 +35,7 @@ public class InsertDataInharmVImpl implements InsertIDataInharmV { @Override public List listDataInharmV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataInharmV::getLineId) .select(DataInharmV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java index 64ad288..881f284 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/java/com/njcn/migration/insert/service/impl/InsertDataVImpl.java @@ -34,7 +34,7 @@ public class InsertDataVImpl implements InsertIDataV { @Override public List listDataV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataV::getLineId) .select(DataV::getPhasicType) @@ -66,7 +66,7 @@ public class InsertDataVImpl implements InsertIDataV { @Override public List listDataVDesc(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataV::getLineId) .select(DataV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java index 3992d3f..f59cda0 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateIImpl.java @@ -29,7 +29,7 @@ public class DataHarmRateIImpl implements IDataHarmRateI { @Override public List listDataHarmrateI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmrateI::getLineId) .select(DataHarmrateI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java index 00f6e50..9606c15 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmRateVImpl.java @@ -29,7 +29,7 @@ public class DataHarmRateVImpl implements IDataHarmRateV { @Override public List listDataHarmrateV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmrateV::getLineId) .select(DataHarmrateV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java index 7f4b1ef..0378f47 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicIImpl.java @@ -35,7 +35,7 @@ public class DataHarmphasicIImpl implements IDataHarmphasicI { public List listDataHarmphasicI(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmphasicI::getLineId) .select(DataHarmphasicI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java index aef2f96..5399bf3 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmphasicVImpl.java @@ -34,7 +34,7 @@ public class DataHarmphasicVImpl implements IDataHarmphasicV { @Override public List listDataHarmphasicV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmphasicV::getLineId) .select(DataHarmphasicV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java index 51d3d39..196756e 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerPImpl.java @@ -34,7 +34,7 @@ public class DataHarmpowerPImpl implements IDataHarmpowerP { @Override public List listDataHarmpowerP(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, InfluxDbSqlConstant.P, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerP::getLineId) .select(DataHarmpowerP::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java index c2a3bb7..5e2dc11 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerQImpl.java @@ -34,7 +34,7 @@ public class DataHarmpowerQImpl implements IDataHarmpowerQ { @Override public List listDataHarmpowerQ(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, InfluxDbSqlConstant.Q, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerQ::getLineId) .select(DataHarmpowerQ::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java index 5e9be07..29423a6 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataHarmpowerSImpl.java @@ -33,7 +33,7 @@ public class DataHarmpowerSImpl implements IDataHarmpowerS { @Override public List listDataHarmpowerS(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, InfluxDbSqlConstant.S, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataHarmpowerS::getLineId) .select(DataHarmpowerS::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java index 11c15f4..72f4aa3 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataIImpl.java @@ -34,7 +34,7 @@ public class DataIImpl implements IDataI { @Override public List listDataI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataI::getLineId) .select(DataI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java index 1d38775..42aa525 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmIImpl.java @@ -33,7 +33,7 @@ public class DataInharmIImpl implements IDataInharmI { @Override public List listDataInharmI(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmI.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.I, InfluxDbSqlConstant.I, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataInharmI::getLineId) .select(DataInharmI::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java index 3b59d65..dc427a3 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataInharmVImpl.java @@ -33,7 +33,7 @@ public class DataInharmVImpl implements IDataInharmV { @Override public List listDataInharmV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataInharmV::getLineId) .select(DataInharmV::getPhasicType) diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java index 85c51f8..8346f3c 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/DataVImpl.java @@ -33,7 +33,7 @@ public class DataVImpl implements IDataV { @Override public List listDataV(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataV::getLineId) .select(DataV::getPhasicType) @@ -71,7 +71,7 @@ public class DataVImpl implements IDataV { @Override public List listDataVDesc(LineCountEvaluateParam lineParam) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); - influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper .select(DataV::getLineId) .select(DataV::getPhasicType)