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

添加Qualityflag默认值

Browse Source
This commit is contained in:
hzj
2025-07-10 15:33:50 +08:00
parent 18381ab2cc
commit fdb54dc678
15 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java
View File

@@ -63,7 +63,7 @@ public class DataFlicker {
influxDBDataFlicker.setFluc(Objects.isNull(dataFlicker.getFluc())?0.00:dataFlicker.getFluc());
influxDBDataFlicker.setPlt(Objects.isNull(dataFlicker.getPlt())?0.00:dataFlicker.getPlt());
influxDBDataFlicker.setPst(Objects.isNull(dataFlicker.getPst())?0.00:dataFlicker.getPst());
influxDBDataFlicker.setQualityFlag(dataFlicker.getQualityflag()+"");
influxDBDataFlicker.setQualityFlag(Objects.isNull(dataFlicker.getQualityflag())?dataFlicker.getQualityflag()+"":"0");
influxDBDataFlicker.setAbnormalFlag(dataFlicker.getAbnormalFlag());
return influxDBDataFlicker;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java
View File

@@ -59,7 +59,7 @@ public class DataFluc {
influxDBDataFluc.setPhasicType(dataFluc.getPhasicType());
influxDBDataFluc.setFluc(Objects.isNull(dataFluc.getFluc())?0.00:dataFluc.getFluc());
influxDBDataFluc.setFluccf(Objects.isNull(dataFluc.getFluccf())?0.00:dataFluc.getFluccf());
influxDBDataFluc.setQualityFlag(dataFluc.getQualityflag()+"");
influxDBDataFluc.setQualityFlag(Objects.isNull(dataFluc.getQualityflag())?dataFluc.getQualityflag()+"":"0");
influxDBDataFluc.setAbnormalFlag(dataFluc.getAbnormalFlag());
return influxDBDataFluc;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java
View File

@@ -211,7 +211,7 @@ public class DataHarmphasicI {
influxDBDataHarmPhasicI.setTime(instant);
influxDBDataHarmPhasicI.setLineId(dataHarmphasicI.getLineid());
influxDBDataHarmPhasicI.setPhasicType(dataHarmphasicI.getPhasicType());
influxDBDataHarmPhasicI.setQualityFlag(dataHarmphasicI.getQualityflag()+"");
influxDBDataHarmPhasicI.setQualityFlag(Objects.isNull(dataHarmphasicI.getQualityflag())?dataHarmphasicI.getQualityflag()+"":"0");
influxDBDataHarmPhasicI.setValueType(valueType);
influxDBDataHarmPhasicI.setAbnormalFlag(dataHarmphasicI.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java
View File

@@ -211,7 +211,7 @@ public class DataHarmphasicV {
InfluxDBDataHarmphasicV.setTime(instant);
InfluxDBDataHarmphasicV.setLineId(dataHarmphasicV.getLineid());
InfluxDBDataHarmphasicV.setPhasicType(dataHarmphasicV.getPhasicType());
InfluxDBDataHarmphasicV.setQualityFlag(dataHarmphasicV.getQualityflag()+"");
InfluxDBDataHarmphasicV.setQualityFlag(Objects.isNull(dataHarmphasicV.getQualityflag())?dataHarmphasicV.getQualityflag()+"":"0");
InfluxDBDataHarmphasicV.setValueType(valueType);
InfluxDBDataHarmphasicV.setAbnormalFlag(dataHarmphasicV.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java
View File

@@ -220,7 +220,7 @@ public class DataHarmpowerP {
influxDBDataHarmpowerP.setTime(instant);
influxDBDataHarmpowerP.setLineId(dataHarmpowerP.getLineid());
influxDBDataHarmpowerP.setPhasicType(dataHarmpowerP.getPhasicType());
influxDBDataHarmpowerP.setQualityFlag(dataHarmpowerP.getQualityflag()+"");
influxDBDataHarmpowerP.setQualityFlag(Objects.isNull(dataHarmpowerP.getQualityflag())?dataHarmpowerP.getQualityflag()+"":"0");
influxDBDataHarmpowerP.setValueType(valueType);
influxDBDataHarmpowerP.setAbnormalFlag(dataHarmpowerP.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java
View File

@@ -214,7 +214,7 @@ public class DataHarmpowerQ {
influxDBDataHarmpowerQ.setTime(instant);
influxDBDataHarmpowerQ.setLineId(dataHarmpowerQ.getLineid());
influxDBDataHarmpowerQ.setPhasicType(dataHarmpowerQ.getPhasicType());
influxDBDataHarmpowerQ.setQualityFlag(dataHarmpowerQ.getQualityflag()+"");
influxDBDataHarmpowerQ.setQualityFlag(Objects.isNull(dataHarmpowerQ.getQualityflag())?dataHarmpowerQ.getQualityflag()+"":"0");
influxDBDataHarmpowerQ.setValueType(valueType);
influxDBDataHarmpowerQ.setAbnormalFlag(dataHarmpowerQ.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java
View File

@@ -214,7 +214,7 @@ public class DataHarmpowerS {
influxDBDataHarmpowerS.setTime(instant);
influxDBDataHarmpowerS.setLineId(dataHarmpowerS.getLineid());
influxDBDataHarmpowerS.setPhasicType(dataHarmpowerS.getPhasicType());
influxDBDataHarmpowerS.setQualityFlag(dataHarmpowerS.getQualityflag()+"");
influxDBDataHarmpowerS.setQualityFlag(Objects.isNull(dataHarmpowerS.getQualityflag())?dataHarmpowerS.getQualityflag()+"":"0");
influxDBDataHarmpowerS.setValueType(valueType);
influxDBDataHarmpowerS.setAbnormalFlag(dataHarmpowerS.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java
View File

@@ -210,7 +210,7 @@ public class DataHarmrateI {
influxDBDataHarmRateI.setTime(instant);
influxDBDataHarmRateI.setLineId(dataHarmrateI.getLineid());
influxDBDataHarmRateI.setPhasicType(dataHarmrateI.getPhasicType());
influxDBDataHarmRateI.setQualityFlag(dataHarmrateI.getQualityflag()+"");
influxDBDataHarmRateI.setQualityFlag(Objects.isNull(dataHarmrateI.getQualityflag())?dataHarmrateI.getQualityflag()+"":"0");
influxDBDataHarmRateI.setValueType(valueType);
if (valueType.equals("AVG")) {
influxDBDataHarmRateI.setI1(Objects.isNull(dataHarmrateI.getI1())?0.00:dataHarmrateI.getI1());

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java
View File

@@ -210,7 +210,7 @@ public class DataHarmrateV {
influxDBDataHarmRateV.setTime(instant);
influxDBDataHarmRateV.setLineId(dataHarmrateV.getLineid());
influxDBDataHarmRateV.setPhasicType(dataHarmrateV.getPhasicType());
influxDBDataHarmRateV.setQualityFlag(dataHarmrateV.getQualityflag()+"");
influxDBDataHarmRateV.setQualityFlag(Objects.isNull(dataHarmrateV.getQualityflag())?dataHarmrateV.getQualityflag()+"":"0");
influxDBDataHarmRateV.setValueType(valueType);
influxDBDataHarmRateV.setAbnormalFlag(dataHarmrateV.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java
View File

@@ -229,7 +229,7 @@ public class DataI {
influxDBDataI.setTime(instant);
influxDBDataI.setLineId(dataI.getLineid());
influxDBDataI.setPhasicType(dataI.getPhasicType());
influxDBDataI.setQualityFlag(dataI.getQualityflag()+"");
influxDBDataI.setQualityFlag(Objects.isNull(dataI.getQualityflag())?dataI.getQualityflag()+"":"0");
influxDBDataI.setValueType(valueType);
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java
View File

@@ -212,7 +212,7 @@ public class DataInharmI {
influxDBDataInHarmI.setTime(instant);
influxDBDataInHarmI.setLineId(dataInharmI.getLineid());
influxDBDataInHarmI.setPhasicType(dataInharmI.getPhasicType());
influxDBDataInHarmI.setQualityFlag(dataInharmI.getQualityflag()+"");
influxDBDataInHarmI.setQualityFlag(Objects.isNull(dataInharmI.getQualityflag())?dataInharmI.getQualityflag()+"":"0");
influxDBDataInHarmI.setValueType(valueType);
if (valueType.equals("AVG")) {
influxDBDataInHarmI.setI1(Objects.isNull(dataInharmI.getI1())?0.00:dataInharmI.getI1());

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java
View File

@@ -211,7 +211,7 @@ public class DataInharmV {
influxDBDataInHarmV.setTime(instant);
influxDBDataInHarmV.setLineId(dataInharmV.getLineid());
influxDBDataInHarmV.setPhasicType(dataInharmV.getPhasicType());
influxDBDataInHarmV.setQualityFlag(dataInharmV.getQualityflag()+"");
influxDBDataInHarmV.setQualityFlag(Objects.isNull(dataInharmV.getQualityflag())?dataInharmV.getQualityflag()+"":"0");
influxDBDataInHarmV.setValueType(valueType);
influxDBDataInHarmV.setAbnormalFlag(dataInharmV.getAbnormalFlag());
if (valueType.equals("AVG")) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java
View File

@@ -56,7 +56,7 @@ public class DataPlt {
influxDBDataPlt.setLineId(dataPlt.getLineid());
influxDBDataPlt.setPhasicType(dataPlt.getPhasicType());
influxDBDataPlt.setPlt(Objects.isNull(dataPlt.getPlt())?0.00:dataPlt.getPlt());
influxDBDataPlt.setQualityFlag(dataPlt.getQualityflag()+"");
influxDBDataPlt.setQualityFlag(Objects.isNull(dataPlt.getQualityflag())?dataPlt.getQualityflag()+"":"0");
influxDBDataPlt.setAbnormalFlag(dataPlt.getAbnormalFlag());
return influxDBDataPlt;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataV.java
View File

@@ -246,7 +246,7 @@ public class DataV {
influxDBDataV.setTime(instant);
influxDBDataV.setLineId(dataV.getLineid());
influxDBDataV.setPhasicType(dataV.getPhasicType());
influxDBDataV.setQualityFlag(dataV.getQualityflag()+"");
influxDBDataV.setQualityFlag(Objects.isNull(dataV.getQualityflag())?dataV.getQualityflag()+"":"0");
influxDBDataV.setValueType(valueType);
//T相时特殊处理RmsLvr将Rmsab，Rmsbc，Rmsca转纯的abc3相里
if(Objects.equals(dataV.getPhasicType(),"T")){

59
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/util/BeanFeildUtils.java
View File

@@ -4,8 +4,9 @@ import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import java.beans.PropertyDescriptor;
import java.util.HashSet;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* Description:
@@ -28,8 +29,60 @@ public class BeanFeildUtils {
String[] result = new String[emptyNames.size()];
return emptyNames.toArray(result);
}
public static List<String> parseTemplateValues(String template, String actualString) {
List<String> values = new ArrayList<>();
// 分割模板字符串，以%s为分隔符
String[] templateParts = template.split("%s", -1); // -1保留末尾空字符串
int currentPos = 0;
for (int i = 0; i < templateParts.length - 1; i++) {
String part = templateParts[i];
// 在原始字符串中找到当前模板部分的位置
int partIndex = actualString.indexOf(part, currentPos);
if (partIndex == -1) {
throw new IllegalArgumentException("字符串不匹配模板");
}
// 计算值开始位置
int valueStart = partIndex + part.length();
// 找到下一个模板部分的位置来确定值结束位置
String nextPart = templateParts[i + 1];
int nextPartIndex;
if (nextPart.isEmpty()) {
// 如果下一个部分是空字符串，则值到字符串末尾
nextPartIndex = actualString.length();
} else {
nextPartIndex = actualString.indexOf(nextPart, valueStart);
if (nextPartIndex == -1) {
throw new IllegalArgumentException("字符串不匹配模板");
}
}
// 提取值
String value = actualString.substring(valueStart, nextPartIndex);
values.add(value);
currentPos = nextPartIndex;
}
return values;
}
public static void main(String[] args) {
System.out.println("lineid".equalsIgnoreCase("lineId"));
List<String> collect = Stream.of("1", "2", "3", "4").collect(Collectors.toList());
collect.forEach(temp->{
if(Objects.equals("2",temp)){
return;
}
System.out.println(temp);
});
String temp ="业务管理员进行删除装置(黄海变_前置测试装置)操作,详细信息:黄海变_前置测试装置;前置信息:辽宁前置";
String temLos = "%s,详细信息:%s;前置信息:%s";
List<String> strings = parseTemplateValues(temLos, temp);
System.out.println(strings);
}
}