更改电压上下限和功率因数上限更新6

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -915,7 +915,12 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
 
 
         //频率（平均）
-        Double cAvgF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getAvgF()));
+        Double cAvgF = 0.00;
+        if (SingleLoopReportList.get(0).getAvgF()>=50){
+            cAvgF = Double.valueOf(df.format(SingleLoopReportList.get(0).getAvgF()-50.00));
+        }else {
+            cAvgF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getAvgF()));
+        }
         singleLoopReportOneVo.setAvgF(df.format(SingleLoopReportList.get(0).getAvgF())+"Hz（"+cAvgF+"Hz）");
         if (SingleLoopReportList.get(0).getAvgF()<50.2&&SingleLoopReportList.get(0).getAvgF()>49.8){
             singleLoopReportOneVo.setAvgFStatus(true);
@@ -923,7 +928,12 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             singleLoopReportOneVo.setAvgFStatus(false);
         }
         //频率（最大）
-        Double cMaxF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getMaxF()));
+        Double cMaxF = 0.00;
+        if (SingleLoopReportList.get(0).getAvgF()>=50){
+            cMaxF = Double.valueOf(df.format( SingleLoopReportList.get(0).getMaxF()-50.00));
+        }else {
+            cMaxF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getMaxF()));
+        }
         singleLoopReportOneVo.setMaxF(df.format(SingleLoopReportList.get(0).getMaxF())+"Hz（"+cMaxF+"Hz）");
         if (SingleLoopReportList.get(0).getMaxF()<50.2&&SingleLoopReportList.get(0).getMaxF()>49.8){
             singleLoopReportOneVo.setMaxFStatus(true);
@@ -931,7 +941,13 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             singleLoopReportOneVo.setMaxFStatus(false);
         }
         //频率（最小）
-        Double cMinF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getMinF()));
+        Double cMinF = 0.00;
+        if (SingleLoopReportList.get(0).getAvgF()>=50){
+            cMinF = Double.valueOf(df.format(SingleLoopReportList.get(0).getMinF()-50.00));
+        }else {
+            cMinF = Double.valueOf(df.format(50.00 - SingleLoopReportList.get(0).getMinF()));
+        }
+
         singleLoopReportOneVo.setMinF(df.format(SingleLoopReportList.get(0).getMinF())+"Hz（"+cMinF+"Hz）");
         if (SingleLoopReportList.get(0).getMinF()<50.2&&SingleLoopReportList.get(0).getMinF()>49.8){
             singleLoopReportOneVo.setMinFStatus(true);
@@ -988,7 +1004,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                     OverrunUc ++;
                 }
 
-                if (RtAnalogDataList.get(i).getF()>50.2||RtAnalogDataList.get(i).getF()<49.8){
+                if (RtAnalogDataList.get(i).getF()<50.2&&RtAnalogDataList.get(i).getF()>49.8){
                     OverrunF ++;
                 }
 
@@ -998,7 +1014,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 checkList.add(RtAnalogDataList.get(i).getIc());
                 //电流不平衡
                 Double ElBalun = checkBalun(checkList);
-                if (ElBalun>0.15){
+                if (ElBalun<0.15){
                     OverrunElBalun ++;
                 }
 
@@ -1008,7 +1024,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 checkList.add(RtAnalogDataList.get(i).getUc());
                 //电压不平衡
                 Double VtBalunQ = checkBalun(checkList);
-                if (VtBalunQ>0.15){
+                if (VtBalunQ<0.15){
                     OverrunVtBalun ++;
                 }