Middleware/cn-data-platform
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

算法微调

Browse Source
This commit is contained in:
wr
2025-07-23 14:17:54 +08:00
parent a3e180c070
commit 3505b16385
2 changed files with 236 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

392
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java
View File

@@ -1182,19 +1182,23 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.Freq.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.Freq.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getFreq() < pqReasonableRangeDto.getMinValue() || dto.getFreq() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getFreq())){
//log.info("dataV-频率数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreq(), dto.getMinTime()); if (dto.getFreq() < pqReasonableRangeDto.getMinValue() || dto.getFreq() > pqReasonableRangeDto.getMaxValue()) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-频率数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreq(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getFreq() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getFreq()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("freq{}", dto);
} }
} }
@@ -1202,19 +1206,23 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.FreqDev.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.FreqDev.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getFreqDev() < pqReasonableRangeDto.getMinValue() || dto.getFreqDev() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getFreqDev())){
//log.info("dataV-频率偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreqDev(), dto.getMinTime()); if (dto.getFreqDev() < pqReasonableRangeDto.getMinValue() || dto.getFreqDev() > pqReasonableRangeDto.getMaxValue()) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-频率偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreqDev(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getFreqDev() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getFreqDev()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("freqDev{}", dto);
} }
} }
@@ -1222,20 +1230,24 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getRms() < (pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel())) if(ObjectUtil.isNotNull(dto.getRms())){
|| dto.getRms() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { if (dto.getRms() < (pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel()))
//log.info("dataV-相电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRms(), dto.getMinTime()); || dto.getRms() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-相电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRms(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getRms() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel()) ,dto.getRms()
,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); ,pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel())
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
list.add(pqDataVerify);
}
}else{
logger.info("rmsV{}", dto);
} }
} }
@@ -1243,20 +1255,24 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getVPos() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) if(ObjectUtil.isNotNull(dto.getVPos())){
|| dto.getVPos() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { if (dto.getVPos() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
//log.info("dataV-正序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVPos(), dto.getMinTime()); || dto.getVPos() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-正序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVPos(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getVPos() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) ,dto.getVPos()
,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
list.add(pqDataVerify);
}
}else{
logger.info("vPos{}", dto);
} }
} }
@@ -1264,20 +1280,24 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.VNeg.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VNeg.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) if(ObjectUtil.isNotNull(dto.getVNeg())){
|| dto.getVNeg() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
//log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime()); || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getVNeg() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) ,dto.getVNeg()
,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
list.add(pqDataVerify);
}
}else{
logger.info("vNeg{}", dto);
} }
} }
@@ -1285,20 +1305,24 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.VZero.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VZero.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getVZero() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) if(ObjectUtil.isNotNull(dto.getVZero())){
|| dto.getVZero() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { if (dto.getVZero() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
//log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime()); || dto.getVZero() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getVZero() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) ,dto.getVZero()
,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
list.add(pqDataVerify);
}
}else{
logger.info("vZero{}", dto);
} }
} }
@@ -1306,19 +1330,23 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.VUnbalance.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VUnbalance.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getVUnbalance() < pqReasonableRangeDto.getMinValue() || dto.getVUnbalance() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getVUnbalance())){
//log.info("dataV-电压不平衡度数据异常,已清洗!数据值:{},数据时间:{}", dto.getVUnbalance(), dto.getMinTime()); if (dto.getVUnbalance() < pqReasonableRangeDto.getMinValue() || dto.getVUnbalance() > pqReasonableRangeDto.getMaxValue()) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-电压不平衡度数据异常,已清洗!数据值:{},数据时间:{}", dto.getVUnbalance(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getVUnbalance() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getVUnbalance()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("vUnbalance{}", dto);
} }
} }
@@ -1385,6 +1413,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
} }
} }
} }
}else{
logger.info("vuDev{}", dto);
} }
// //线电压正偏差 // //线电压正偏差
@@ -1431,19 +1461,23 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.VThd.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VThd.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getVThd() < pqReasonableRangeDto.getMinValue() || dto.getVThd() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getVThd())){
//log.info("dataV-电压总谐波畸变率数据异常,已清洗!数据值:{},数据时间:{}", dto.getVThd(), dto.getMinTime()); if (dto.getVThd() < pqReasonableRangeDto.getMinValue() || dto.getVThd() > pqReasonableRangeDto.getMaxValue()) {
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() //log.info("dataV-电压总谐波畸变率数据异常,已清洗!数据值:{},数据时间:{}", dto.getVThd(), dto.getMinTime());
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getVThd() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getVThd()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("vThd{}", dto);
} }
} }
@@ -1481,18 +1515,22 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.RmsI.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.RmsI.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getRms() >= line.getCT1() * 1.2) { if(ObjectUtil.isNotNull(dto.getRms())){
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() if (dto.getRms() >= line.getCT1() * 1.2) {
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getRms() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getRms()
,line.getCT1()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,line.getCT1());
list.add(pqDataVerify);
}
}else{
logger.info("rmsI{}", dto);
} }
} }
return list; return list;
@@ -1509,18 +1547,22 @@ public class DataCleanServiceImpl implements IDataCleanService {
pqReasonableRangeDto = map.get(DataCleanEnum.Plt.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.Plt.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getPlt() < pqReasonableRangeDto.getMinValue() || dto.getPlt() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getPlt())){
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() if (dto.getPlt() < pqReasonableRangeDto.getMinValue() || dto.getPlt() > pqReasonableRangeDto.getMaxValue()) {
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getPlt() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getPlt()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("plt{}", dto);
} }
} }
return list; return list;
@@ -1602,18 +1644,22 @@ public class DataCleanServiceImpl implements IDataCleanService {
PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pf.getCode()); PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pf.getCode());
List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getPf() < pqReasonableRangeDto.getMinValue() || dto.getPf() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getPf())){
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() if (dto.getPf() < pqReasonableRangeDto.getMinValue() || dto.getPf() > pqReasonableRangeDto.getMaxValue()) {
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getPf() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getPf()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("pf{}", dto);
} }
} }
return list; return list;
@@ -1653,6 +1699,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
); );
list.add(pqDataVerify); list.add(pqDataVerify);
} }
}else {
logger.info("DataHarmPhasicV{}", dto);
} }
} }
} }
@@ -1667,18 +1715,22 @@ public class DataCleanServiceImpl implements IDataCleanService {
PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Fluc.getCode()); PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Fluc.getCode());
List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getFluc() < pqReasonableRangeDto.getMinValue() || dto.getFluc() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getFluc())){
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() if (dto.getFluc() < pqReasonableRangeDto.getMinValue() || dto.getFluc() > pqReasonableRangeDto.getMaxValue()) {
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getFluc() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getFluc()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("flus{}", dto);
} }
} }
return list; return list;
@@ -1692,18 +1744,22 @@ public class DataCleanServiceImpl implements IDataCleanService {
PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pst.getCode()); PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pst.getCode());
List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); List<String> phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (dto.getPst() < pqReasonableRangeDto.getMinValue() || dto.getPst() > pqReasonableRangeDto.getMaxValue()) { if(ObjectUtil.isNotNull(dto.getPst())){
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() if (dto.getPst() < pqReasonableRangeDto.getMinValue() || dto.getPst() > pqReasonableRangeDto.getMaxValue()) {
,dto.getMinTime() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
,dto.getValueType() ,dto.getMinTime()
,dto.getPhasicType() ,dto.getValueType()
,pqReasonableRangeDto.getIndexCode() ,dto.getPhasicType()
,pqReasonableRangeDto.getIndexName() ,pqReasonableRangeDto.getIndexCode()
,pqReasonableRangeDto.getInfluxdbTableName() ,pqReasonableRangeDto.getIndexName()
,dto.getPst() ,pqReasonableRangeDto.getInfluxdbTableName()
,pqReasonableRangeDto.getMinValue() ,dto.getPst()
,pqReasonableRangeDto.getMaxValue()); ,pqReasonableRangeDto.getMinValue()
list.add(pqDataVerify); ,pqReasonableRangeDto.getMaxValue());
list.add(pqDataVerify);
}
}else{
logger.info("pst{}", dto);
} }
} }
return list; return list;

15
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java
View File

@@ -585,8 +585,12 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
// 获取 Overlimit 类的 getUharmx 方法 // 获取 Overlimit 类的 getUharmx 方法
Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i); Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i);
float limit = (float) getUharmMethod.invoke(overlimit); float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit) { if (ObjectUtil.isNotNull(value)){
addAbnormalData(v[i - 2], item.getValueType(), item.getPhasicType(), item.getMinTime(), value, limit); if (value > limit) {
addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
}else{
addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -727,7 +731,12 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
// 获取 Overlimit 类的 getUharmx 方法 // 获取 Overlimit 类的 getUharmx 方法
Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i); Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i);
float limit = (float) getUharmMethod.invoke(overlimit); float limit = (float) getUharmMethod.invoke(overlimit);
if (value > limit) { if (ObjectUtil.isNotNull(value)){
if (value > limit) {
addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
}
}else{
System.out.println(item);
addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit); addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit);
} }
} catch (Exception e) { } catch (Exception e) {