污区算法bug修改

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java

@@ -1838,11 +1838,11 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
 
     private String dealVoltageLevel(String voltage) {
         float scale = Float.parseFloat(voltage.substring(0, voltage.indexOf("kV")));
-        if (scale < 500) {
+        //if (scale < 500) {
             return "交流" + voltage;
-        } else {
+        //} else {
-            return "直流" + voltage;
+           // return "直流" + voltage;
-        }
+        //}
 
     }
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java

@@ -594,8 +594,19 @@ public class PollutionServiceImpl implements PollutionService {
         for (RStatDataVDPO dayV : list) {
             for (Overlimit overlimit : overLimitList) {
                 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());
                     double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get();
                     publicDTO = new PublicDTO();