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

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapcityServiceImpl.java
View File

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

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
View File

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

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

17
pqs-prepare/prepare-boot/src/test/java/com/njcn/BaseJunitTest.java
View File

@@ -1,23 +1,16 @@
package com.njcn;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.njcn.common.utils.HarmonicTimesUtil;
import com.njcn.influx.constant.InfluxDbSqlConstant;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
import com.njcn.influx.imapper.DataVMapper;
import com.njcn.influx.pojo.bo.MeasurementCount;
import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
import com.njcn.influx.pojo.po.DataV;
import com.njcn.influx.query.InfluxQueryWrapper;
import com.njcn.influx.utils.InfluxDbUtils;
import com.njcn.prepare.PrepareApplication;
import com.njcn.prepare.harmonic.service.mysql.Impl.line.IntegrityServiceImpl;
import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitRateServiceImpl;
import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitTargetServiceImpl;
import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService;
import lombok.SneakyThrows;
import org.influxdb.dto.QueryResult;
import org.influxdb.impl.InfluxDBResultMapper;
@@ -28,11 +21,9 @@ import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -76,7 +67,7 @@ public class BaseJunitTest {
.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);
result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper);
System.out.println("result1==:" + result1);
@@ -96,7 +87,7 @@ public class BaseJunitTest {
.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);
result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -115,7 +106,7 @@ public class BaseJunitTest {
.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);
result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper);
long time2 = System.currentTimeMillis();
@@ -216,7 +207,7 @@ public class BaseJunitTest {
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.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, time1, time2);
List<DataV> list = dataVMapper.getStatisticsByWraper(influxQueryWrapper);

12
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
private final WordUtil2 wordUtil2;
private final DataVMapper dataVMapper;
private final IDataIMapper dataIMapper;
private final DataIMapper dataIMapper;
private final DataHarmRateVMapper dataHarmRateVMapper;
private final DataInHarmVMapper dataInHarmVMapper;
private final DataPltMapper dataPltMapper;
@@ -786,7 +786,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper2.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhasicType,"T")
.eq(DataV::getPhaseType,"T")
.max(DataV::getFreqDev)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper2);
@@ -799,14 +799,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MIN)
.regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
.regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.min(DataV::getVuDev)
.between(DataV::getTime, startTime, endTime);
List<DataV> 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<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.CP95)
.regular(DataV::getPhasicType,Arrays.asList("A","B","C"))
.regular(DataV::getPhaseType,Arrays.asList("A","B","C"))
.max(DataV::getVThd)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper);
@@ -845,7 +845,7 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
influxQueryWrapper.eq(DataV::getLineId, lineIndex)
.eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
.eq(DataV::getPhasicType,"T")
.eq(DataV::getPhaseType,"T")
.max(DataV::getVUnbalance)
.between(DataV::getTime, startTime, endTime);
return dataVMapper.getStatisticsByWraper(influxQueryWrapper);