From dbf0027c657a7be4880ba37f0d42b43752331d96 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 7 Jan 2026 18:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/line/IDataLimitRateAsync.java     |  4 +++-
 .../line/IDataCrossingServiceImpl.java        |  2 +-
 .../line/IDataLimitRateAsyncImpl.java         | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java
index 8b9aca6..3614677 100644
--- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java
+++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java
@@ -15,6 +15,7 @@ public interface IDataLimitRateAsync {
      * @param overLimitMap
      * @param size
      * @param i
+     * @param type 系统类型
      * @Author: wr
      * @Date: 2025/12/17 12:16
      */
@@ -23,5 +24,6 @@ public interface IDataLimitRateAsync {
                       List<String> phase,
                       Map<String, Overlimit> overLimitMap,
                       int size,
-                      int i);
+                      int i,
+                      int type);
 }
diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java
index 77123dc..f9191c0 100644
--- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java
+++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java
@@ -111,7 +111,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
         for (int i = 0; i < pendingIds.size(); i++) {
             logger.info(calculatedParam.getDataDate()+" 总分区数据：" + pendingIds.size() + "=====》当前第"+(i + 1)+"小分区");
             List<String> list = pendingIds.get(i);
-            dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1));
+            dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1), lineParam.getType());
         }
         System.gc();
     }
diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java
index 1b00aef..3643d04 100644
--- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java
+++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java
@@ -64,12 +64,14 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
                              List<String> phase,
                              Map<String, Overlimit> overLimitMap,
                              int size,
-                             int i) {
+                             int i,
+                             int type) {
         List<DataLimitDetailDto> result = new ArrayList<>();
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(dataDate));
         lineParam.setEndTime(TimeUtils.getEndOfDay(dataDate));
         lineParam.setLineId(list);
+        lineParam.setType(type);
         //获取电压数据
         List<DataVDto> dataVAllTime = dataVFeignClient.getRawData(lineParam).getData();
         //闪变数据
@@ -94,10 +96,17 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          *               闪变总计算次数(用data_plt中phasic_type=A,value_type=avg,quality_flag=0来参与统计)
          */
         //fixme 冀北现场 闪变原始表没有 value_type 这个参数
-        Map<String, List<DataPltDto>> pltAllTime = dataPltAllTime.stream()
-                .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
-//                    .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataPltDto::getLineId));
+        Map<String, List<DataPltDto>> pltAllTime;
+        if (type == 2) {
+            pltAllTime = dataPltAllTime.stream()
+                    .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
+                    .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataPltDto::getLineId));
+        } else {
+            pltAllTime = dataPltAllTime.stream()
+                    .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
+                    .collect(Collectors.groupingBy(DataPltDto::getLineId));
+        }
 
         /**
          *功能描述:获取influxDB -> data_harmrate_v ->