diff --git a/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java b/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java index 0b09982d..8dfa0d33 100644 --- a/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java @@ -70,7 +70,7 @@ public class PqFreqConverterTestResServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.between(PqFreqConverterTestRes::getResidualVoltage, residualVoltage - freqConverterConfig.getAllowErrorResidualVoltage(), residualVoltage + freqConverterConfig.getAllowErrorDuration()) + queryWrapper.between(PqFreqConverterTestRes::getResidualVoltage, residualVoltage - freqConverterConfig.getAllowErrorResidualVoltage(), residualVoltage + freqConverterConfig.getAllowErrorResidualVoltage()) .ne(PqFreqConverterTestRes::getId, id) .orderByDesc(PqFreqConverterTestRes::getDurationMs) .last("limit 1"); diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index 5266ad6d..a98719ca 100644 --- a/entrance/src/main/resources/application.yml +++ b/entrance/src/main/resources/application.yml @@ -133,4 +133,4 @@ freq-converter: dt: 200 #延迟时间ms direction: 0 #0为横向1为纵向 allow-error-duration: 6 #暂态持续时间允许最大误差ms - allow-error-vesidual-voltage: 2.0 #暂态幅值允许最多误差% \ No newline at end of file + allow-error-residual-voltage: 2.0 #暂态幅值允许最多误差%