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

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

@@ -965,7 +965,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 Double minUa = checkList.stream().min(Double::compareTo).get();
                 Double wantingUa = Arith.sub(maxUa, minUa);
                 if (wantingUa<voltageLevelWanting){
-                    OverrunUa += OverrunUa;
+                    OverrunUa++;
                 }
 
                 checkList.clear();
@@ -975,7 +975,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 Double minUb = checkList.stream().min(Double::compareTo).get();
                 Double wantingUb = Arith.sub(maxUb, minUb);
                 if (wantingUb<voltageLevelWanting){
-                    OverrunUb += OverrunUb;
+                    OverrunUb ++;
                 }
 
                 checkList.clear();
@@ -985,11 +985,11 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 Double minUc = checkList.stream().min(Double::compareTo).get();
                 Double wantingUc = Arith.sub(maxUc, minUc);
                 if (wantingUc<voltageLevelWanting){
-                    OverrunUc += OverrunUc;
+                    OverrunUc ++;
                 }
 
                 if (RtAnalogDataList.get(i).getF()>50.2||RtAnalogDataList.get(i).getF()<49.8){
-                    OverrunF += OverrunF;
+                    OverrunF ++;
                 }
 
                 checkList.clear();
@@ -999,7 +999,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 //电流不平衡
                 Double ElBalun = checkBalun(checkList);
                 if (ElBalun>0.15){
-                    OverrunElBalun += OverrunElBalun;
+                    OverrunElBalun ++;
                 }
 
                 checkList.clear();
@@ -1009,18 +1009,18 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
                 //电压不平衡
                 Double VtBalunQ = checkBalun(checkList);
                 if (VtBalunQ>0.15){
-                    OverrunVtBalun += OverrunVtBalun;
+                    OverrunVtBalun ++;
                 }
 
 
             }
         }
-        singleLoopReportOneVo.setProportionUa(OverrunUa+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setProportionUb(OverrunUb+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setProportionUc(OverrunUc+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setProportionF(OverrunF+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setProportionElBalun(OverrunElBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setProportionVtBalun(OverrunVtBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionUa(singleLoopReportOneVo.getMeasuringPoints()-OverrunUa+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionUb(singleLoopReportOneVo.getMeasuringPoints()-OverrunUb+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionUc(singleLoopReportOneVo.getMeasuringPoints()-OverrunUc+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionF(singleLoopReportOneVo.getMeasuringPoints()-OverrunF+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionElBalun(singleLoopReportOneVo.getMeasuringPoints()-OverrunElBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
+        singleLoopReportOneVo.setProportionVtBalun(singleLoopReportOneVo.getMeasuringPoints()-OverrunVtBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
         singleLoopReportOneVo.setQrUa(OverrunUa==0?00.00:Double.valueOf(OverrunUa)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
         singleLoopReportOneVo.setQrUb(OverrunUb==0?00.00:Double.valueOf(OverrunUb)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
         singleLoopReportOneVo.setQrUc(OverrunUc==0?00.00:Double.valueOf(OverrunUc)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);