From 7bf8b9d393199d89386e062ecbced3df5d7501e7 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 22 Jun 2026 19:29:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(influxdb):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E7=9B=B8=E4=BD=8D=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉 InfluxdbDataHarmpowerPImpl 中 phasicType 和 lineParam.type 的条件判断
- 注释掉 InfluxdbDataHarmpowerQImpl 中 phasicType 和 lineParam.type 的条件判断
- 注释掉 InfluxdbDataHarmpowerSImpl 中 phasicType 和 lineParam.type 的条件判断
- 统一使用 extractDataLists(valueTypeList, "") 进行数据提取
- 简化代码逻辑，提高可读性
---
 .../impl/influxdb/InfluxdbDataHarmpowerPImpl.java    | 11 ++++++-----
 .../impl/influxdb/InfluxdbDataHarmpowerQImpl.java    | 12 ++++++------
 .../impl/influxdb/InfluxdbDataHarmpowerSImpl.java    | 11 ++++++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

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<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);
                     });
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<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);
                     });
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<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);
                     });