Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改influxdb包的字段，类引起的修改

Browse Source
This commit is contained in:
hzj
2024-07-10 09:08:49 +08:00
parent 075205d4b9
commit e12e5d90c8
7 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
View File

@@ -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<DataV> 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<DataV> 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<DataV> 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<DataV> result4 = dataVMapper.getStatisticsByWraper(influxQueryWrapper4);
result4.forEach(item->{

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
View File

@@ -143,7 +143,7 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class,MeasurementCount.class);
influxQueryWrapper.regular(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_A)
.eq(DataV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_A)
.count(DataV::getFreq)
.groupBy(DataV::getLineId)
.between(DataV::getTime, startTime, endTime);

24
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
private final DataVMapper dataVMapper;
private final DataPltMapper dataPltMapper;
private final DataHarmRateVMapper dataHarmRateVMapper;
private final IDataIMapper dataIMapper;
private final DataIMapper dataIMapper;
private final DataInHarmVMapper dataInHarmVMapper;
/*********************************************新算法***********************************************************/
@@ -303,7 +303,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.regular(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.AVG_WEB)
.eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_A)
.eq(DataV::getPhaseType, InfluxDBTableConstant.PHASE_TYPE_A)
.eq(DataV::getQualityFlag, InfluxDBTableConstant.NORMAL)
.count(DataV::getFreq,DataV::getAllTime)
.groupBy(DataV::getLineId)
@@ -433,13 +433,13 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
public List<DataV> getDataVThd(List<String> 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<LimitRatePOMapper, Limi
public List<DataV> getDataVUnbalance(List<String> 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<LimitRatePOMapper, Limi
public List<DataV> getDataVFreq(List<String> 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<LimitRatePOMapper, Limi
public List<DataV> getDataVDev(List<String> 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<LimitRatePOMapper, Limi
dataInHarmVByTime = dataInHarmVPOList.stream ( ).collect (Collectors.groupingBy (DataInHarmV::getTime));
}
if (!CollectionUtils.isEmpty (dataVPOList)) {
dataVPhaseType = dataVPOList.stream ( ).collect (Collectors.groupingBy (DataV::getPhasicType));
dataVPhaseType = dataVPOList.stream ( ).collect (Collectors.groupingBy (DataV::getPhaseType));
dataVByTime = dataVPOList.stream ( ).collect (Collectors.groupingBy (DataV::getTime));
}
if (!CollectionUtils.isEmpty (dataVPOUnbalanceList)) {
@@ -629,7 +629,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
dataVFreqByTime = dataVPOFreqList.stream ( ).collect (Collectors.groupingBy (DataV::getTime));
}
if (!CollectionUtils.isEmpty (dataVPODevList)) {
dataVDevPhaseType = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataV::getPhasicType));
dataVDevPhaseType = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataV::getPhaseType));
dataVDevByTime = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataV::getTime));
}
if (!CollectionUtils.isEmpty (dataPltPOList)) {