fix(influxdb): 恢复功率数据提取中的相位类型判断逻辑
- 在 InfluxdbDataHarmpowerPImpl 中启用相位类型条件判断 - 在 InfluxdbDataHarmpowerQImpl 中启用相位类型条件判断 - 在 InfluxdbDataHarmpowerSImpl 中启用相位类型条件判断 - 恢复了被注释掉的 Tot 参数提取逻辑 - 确保三相类型且线路参数为2时正确提取总量数据
This commit is contained in:
@@ -107,12 +107,11 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
|
|||||||
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
||||||
value.setValueType(valueType);
|
value.setValueType(valueType);
|
||||||
List<List<Double>> lists;
|
List<List<Double>> lists;
|
||||||
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
||||||
// lists = extractDataLists(valueTypeList, "Tot");
|
lists = extractDataLists(valueTypeList, "Tot");
|
||||||
// } else {
|
} else {
|
||||||
// lists = extractDataLists(valueTypeList, "");
|
lists = extractDataLists(valueTypeList, "");
|
||||||
// }
|
}
|
||||||
lists = extractDataLists(valueTypeList, "");
|
|
||||||
value.setValueList(lists);
|
value.setValueList(lists);
|
||||||
valueTypes.add(value);
|
valueTypes.add(value);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -106,12 +106,11 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
|
|||||||
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
||||||
value.setValueType(valueType);
|
value.setValueType(valueType);
|
||||||
List<List<Double>> lists;
|
List<List<Double>> lists;
|
||||||
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
||||||
// lists = extractDataLists(valueTypeList, "Tot");
|
lists = extractDataLists(valueTypeList, "Tot");
|
||||||
// } else {
|
} else {
|
||||||
// lists = extractDataLists(valueTypeList, "");
|
lists = extractDataLists(valueTypeList, "");
|
||||||
// }
|
}
|
||||||
lists = extractDataLists(valueTypeList, "");
|
|
||||||
value.setValueList(lists);
|
value.setValueList(lists);
|
||||||
valueTypes.add(value);
|
valueTypes.add(value);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -106,12 +106,11 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
|
|||||||
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
|
||||||
value.setValueType(valueType);
|
value.setValueType(valueType);
|
||||||
List<List<Double>> lists;
|
List<List<Double>> lists;
|
||||||
// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
|
||||||
// lists = extractDataLists(valueTypeList, "Tot");
|
lists = extractDataLists(valueTypeList, "Tot");
|
||||||
// } else {
|
} else {
|
||||||
// lists = extractDataLists(valueTypeList, "");
|
lists = extractDataLists(valueTypeList, "");
|
||||||
// }
|
}
|
||||||
lists = extractDataLists(valueTypeList, "");
|
|
||||||
value.setValueList(lists);
|
value.setValueList(lists);
|
||||||
valueTypes.add(value);
|
valueTypes.add(value);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user