From 587e9365546d0e022949d100320adebdf1dce275 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 26 Jun 2026 18:01:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(influxdb):=20=E6=81=A2=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E7=8E=87=E6=95=B0=E6=8D=AE=E6=8F=90=E5=8F=96=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E4=BD=8D=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 InfluxdbDataHarmpowerPImpl 中启用相位类型条件判断
- 在 InfluxdbDataHarmpowerQImpl 中启用相位类型条件判断
- 在 InfluxdbDataHarmpowerSImpl 中启用相位类型条件判断
- 恢复了被注释掉的 Tot 参数提取逻辑
- 确保三相类型且线路参数为2时正确提取总量数据
---
 .../impl/influxdb/InfluxdbDataHarmpowerPImpl.java     | 11 +++++------
 .../impl/influxdb/InfluxdbDataHarmpowerQImpl.java     | 11 +++++------
 .../impl/influxdb/InfluxdbDataHarmpowerSImpl.java     | 11 +++++------
 3 files changed, 15 insertions(+), 18 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 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<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, "");
-//                        }
-                        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<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, "");
-//                        }
-                        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<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, "");
-//                        }
-                        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);
                     });