污区算法bug修改
This commit is contained in:
@@ -594,8 +594,19 @@ public class PollutionServiceImpl implements PollutionService {
|
|||||||
for (RStatDataVDPO dayV : list) {
|
for (RStatDataVDPO dayV : list) {
|
||||||
for (Overlimit overlimit : overLimitList) {
|
for (Overlimit overlimit : overLimitList) {
|
||||||
if (Objects.equals(dayV.getLineId(),overlimit.getId())){
|
if (Objects.equals(dayV.getLineId(),overlimit.getId())){
|
||||||
double vlDev = Math.abs(dayV.getVlDev()/overlimit.getUvoltageDev());
|
double vlDev;
|
||||||
double vuDev = Math.abs(dayV.getVuDev()/overlimit.getVoltageDev());
|
double vuDev;
|
||||||
|
if(overlimit.getVoltageDev() == 0){
|
||||||
|
vlDev = 0;
|
||||||
|
}else {
|
||||||
|
vlDev = Math.abs(dayV.getVlDev()/overlimit.getVoltageDev());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(overlimit.getUvoltageDev() == 0){
|
||||||
|
vuDev = 0;
|
||||||
|
}else {
|
||||||
|
vuDev = Math.abs(dayV.getVuDev()/overlimit.getUvoltageDev());
|
||||||
|
}
|
||||||
data = Stream.of(vuDev,vlDev).collect(Collectors.toList());
|
data = Stream.of(vuDev,vlDev).collect(Collectors.toList());
|
||||||
double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
|
double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
|
||||||
publicDTO = new PublicDTO();
|
publicDTO = new PublicDTO();
|
||||||
|
|||||||
Reference in New Issue
Block a user