1.间谐波显示处理
2.超标数据处理
This commit is contained in:
@@ -471,7 +471,7 @@
|
|||||||
)
|
)
|
||||||
) AS allOvertime
|
) AS allOvertime
|
||||||
FROM
|
FROM
|
||||||
`r_stat_limit_target_d`
|
`r_stat_limit_rate_d`
|
||||||
<where>
|
<where>
|
||||||
and time_id between #{startTime} and #{endTime}
|
and time_id between #{startTime} and #{endTime}
|
||||||
<if test=" ids != null and ids.size > 0">
|
<if test=" ids != null and ids.size > 0">
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ import java.time.LocalDateTime;
|
|||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.time.temporal.TemporalAdjusters;
|
import java.time.temporal.TemporalAdjusters;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
@@ -474,7 +473,6 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
|
|||||||
if (Objects.equals(targetCode,DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
|
if (Objects.equals(targetCode,DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
|
||||||
List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),9).getData();
|
List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),9).getData();
|
||||||
if (CollUtil.isNotEmpty(list)) {
|
if (CollUtil.isNotEmpty(list)) {
|
||||||
|
|
||||||
list.forEach(item->{
|
list.forEach(item->{
|
||||||
String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
|
String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
|
||||||
DataInHarmV dataInHarmV = getDataInHarmV(param.getLineId()
|
DataInHarmV dataInHarmV = getDataInHarmV(param.getLineId()
|
||||||
@@ -586,12 +584,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
|
|||||||
method = clazz2.getMethod(methodName);
|
method = clazz2.getMethod(methodName);
|
||||||
if (Objects.nonNull(dataHarmRateV)) {
|
if (Objects.nonNull(dataHarmRateV)) {
|
||||||
value2 = (double) method.invoke(dataHarmRateV);
|
value2 = (double) method.invoke(dataHarmRateV);
|
||||||
|
describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
|
||||||
} else if (Objects.nonNull(dataI)) {
|
} else if (Objects.nonNull(dataI)) {
|
||||||
value2 = (double) method.invoke(dataI);
|
value2 = (double) method.invoke(dataI);
|
||||||
|
describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
|
||||||
} else if (Objects.nonNull(dataInHarmV)) {
|
} else if (Objects.nonNull(dataInHarmV)) {
|
||||||
value2 = (double) method.invoke(dataInHarmV);
|
value2 = (double) method.invoke(dataInHarmV);
|
||||||
|
describe.append((key - 0.5)).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
|
||||||
}
|
}
|
||||||
describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user