diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java index 9b567a4..28831bb 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java @@ -107,11 +107,12 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl> 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); }); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java index 4d77559..0d90276 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java @@ -105,13 +105,13 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl{ CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType(); value.setValueType(valueType); - List> 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); }); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java index 11df88a..581883b 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java @@ -106,11 +106,12 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl> 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); });