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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wr
2026-06-23 15:01:56 +08:00
parent e56dc8c4be 7bf8b9d393
commit aa9dc1b00a
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java
View File

@@ -107,11 +107,12 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
value.setValueType(valueType);
List<List<Double>> lists;
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
lists = extractDataLists(valueTypeList, "Tot");
} else {
lists = extractDataLists(valueTypeList, "");
}
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
// lists = extractDataLists(valueTypeList, "Tot");
// } else {
// lists = extractDataLists(valueTypeList, "");
// }
lists = extractDataLists(valueTypeList, "");
value.setValueList(lists);
valueTypes.add(value);
});

12
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java
View File

@@ -105,13 +105,13 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
valueTypeMap.forEach((valueType,valueTypeList)->{
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
value.setValueType(valueType);
List<List<Double>> lists;
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
lists = extractDataLists(valueTypeList, "Tot");
} else {
lists = extractDataLists(valueTypeList, "");
}
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
// lists = extractDataLists(valueTypeList, "Tot");
// } else {
// lists = extractDataLists(valueTypeList, "");
// }
lists = extractDataLists(valueTypeList, "");
value.setValueList(lists);
valueTypes.add(value);
});

11
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java
View File

@@ -106,11 +106,12 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
value.setValueType(valueType);
List<List<Double>> lists;
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
lists = extractDataLists(valueTypeList, "Tot");
} else {
lists = extractDataLists(valueTypeList, "");
}
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
// lists = extractDataLists(valueTypeList, "Tot");
// } else {
// lists = extractDataLists(valueTypeList, "");
// }
lists = extractDataLists(valueTypeList, "");
value.setValueList(lists);
valueTypes.add(value);
});