From 6b21e9927aae9ef8914d5642ff95efd0f1853301 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 16 Dec 2025 19:10:59 +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/IDataCleanService.java          |  3 +++
 .../serviceimpl/line/DataCleanServiceImpl.java   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java
index f248456..aa4742a 100644
--- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java
+++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java
@@ -2,6 +2,8 @@ package com.njcn.algorithm.service.line;
 
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * @author xy
  */
@@ -92,4 +94,5 @@ public interface IDataCleanService {
      * @param calculatedParam 查询条件
      */
     void dataFlickerCleanHandler(CalculatedParam calculatedParam);
+
 }
diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java
index e351d0a..6bfa46c 100644
--- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java
+++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java
@@ -36,18 +36,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
 import java.lang.reflect.Method;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1264,6 +1263,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         System.gc();
     }
 
+
     /**
      * 获取标准数据的范围
      */
@@ -1408,8 +1408,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
         phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
         if (phaseList.contains(dto.getPhasicType())) {
             if (ObjectUtil.isNotNull(dto.getVNeg())) {
-                if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
-                        || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
+                if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
+                        || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
                     //log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime());
                     PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
                             , dto.getMinTime()
@@ -1433,8 +1433,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
         phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
         if (phaseList.contains(dto.getPhasicType())) {
             if (ObjectUtil.isNotNull(dto.getVZero())) {
-                if (dto.getVZero() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
-                        || dto.getVZero() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
+                if (dto.getVZero() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
+                        || dto.getVZero() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
                     //log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime());
                     PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
                             , dto.getMinTime()