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 28831bb..9b567a4 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,12 +107,11 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl> lists; -// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { -// lists = extractDataLists(valueTypeList, "Tot"); -// } else { -// lists = extractDataLists(valueTypeList, ""); -// } - lists = extractDataLists(valueTypeList, ""); + if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { + lists = extractDataLists(valueTypeList, "Tot"); + } else { + 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 0d90276..27b42f8 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 @@ -106,12 +106,11 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl> lists; -// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { -// lists = extractDataLists(valueTypeList, "Tot"); -// } else { -// lists = extractDataLists(valueTypeList, ""); -// } - lists = extractDataLists(valueTypeList, ""); + if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { + lists = extractDataLists(valueTypeList, "Tot"); + } else { + 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 581883b..11df88a 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,12 +106,11 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl> lists; -// if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { -// lists = extractDataLists(valueTypeList, "Tot"); -// } else { -// lists = extractDataLists(valueTypeList, ""); -// } - lists = extractDataLists(valueTypeList, ""); + if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) { + lists = extractDataLists(valueTypeList, "Tot"); + } else { + lists = extractDataLists(valueTypeList, ""); + } value.setValueList(lists); valueTypes.add(value); });