算法调整

This commit is contained in:
xy
2025-12-16 19:10:59 +08:00
parent c5cb96e8d6
commit 6b21e9927a
2 changed files with 11 additions and 8 deletions

View File

@@ -2,6 +2,8 @@ package com.njcn.algorithm.service.line;
import com.njcn.algorithm.pojo.bo.CalculatedParam; import com.njcn.algorithm.pojo.bo.CalculatedParam;
import java.util.concurrent.CompletableFuture;
/** /**
* @author xy * @author xy
*/ */
@@ -92,4 +94,5 @@ public interface IDataCleanService {
* @param calculatedParam 查询条件 * @param calculatedParam 查询条件
*/ */
void dataFlickerCleanHandler(CalculatedParam calculatedParam); void dataFlickerCleanHandler(CalculatedParam calculatedParam);
} }

View File

@@ -36,18 +36,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.time.Instant; import java.time.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -1264,6 +1263,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
System.gc(); System.gc();
} }
/** /**
* 获取标准数据的范围 * 获取标准数据的范围
*/ */
@@ -1408,8 +1408,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (ObjectUtil.isNotNull(dto.getVNeg())) { if (ObjectUtil.isNotNull(dto.getVNeg())) {
if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|| dto.getVNeg() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
//log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime()); //log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime());
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
, dto.getMinTime() , dto.getMinTime()
@@ -1433,8 +1433,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
if (ObjectUtil.isNotNull(dto.getVZero())) { if (ObjectUtil.isNotNull(dto.getVZero())) {
if (dto.getVZero() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) if (dto.getVZero() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|| dto.getVZero() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { || dto.getVZero() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
//log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime()); //log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime());
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
, dto.getMinTime() , dto.getMinTime()