单线回路计算1

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

@@ -710,7 +710,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getAvgIc());
         //电流不平衡（平均）
         Double AvgElBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setAvgElBalun(AvgElBalun);
+        singleLoopReportOneVo.setAvgElBalun(Double.valueOf(df.format(AvgElBalun)));
         if (AvgElBalun<15){
             singleLoopReportOneVo.setAvgElBalunStatus(true);
         }else {
@@ -723,7 +723,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getMaxIc());
         //电流不平衡（最大）
         Double MaxElBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setMaxElBalun(MaxElBalun);
+        singleLoopReportOneVo.setMaxElBalun(Double.valueOf(df.format(MaxElBalun)));
         if (MaxElBalun<15){
             singleLoopReportOneVo.setMaxElBalunStatus(true);
         }else {
@@ -736,7 +736,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getMinIc());
         //电流不平衡（最小）
         Double MinElBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setMinElBalun(MinElBalun);
+        singleLoopReportOneVo.setMinElBalun(Double.valueOf(df.format(MinElBalun)));
         if (MinElBalun<15){
             singleLoopReportOneVo.setMinElBalunStatus(true);
         }else {
@@ -754,7 +754,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getAvgUc());
         //电压不平衡（平均）
         Double AvgVtBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setAvgVtBalun(AvgVtBalun);
+        singleLoopReportOneVo.setAvgVtBalun(Double.valueOf(df.format(AvgVtBalun)));
         if (AvgVtBalun<15){
             singleLoopReportOneVo.setAvgVtBalunStatus(true);
         }else {
@@ -767,7 +767,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getMaxUc());
         //电压不平衡（最大）
         Double MaxVtBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setMaxVtBalun(MaxVtBalun);
+        singleLoopReportOneVo.setMaxVtBalun(Double.valueOf(df.format(MaxVtBalun)));
         if (MaxVtBalun<15){
             singleLoopReportOneVo.setMaxVtBalunStatus(true);
         }else {
@@ -780,7 +780,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         checkList.add(SingleLoopReportList.get(0).getMinUc());
         //电压不平衡（最小）
         Double MinVtBalun = checkBalun(checkList) * 100;
-        singleLoopReportOneVo.setMinVtBalun(MinVtBalun);
+        singleLoopReportOneVo.setMinVtBalun(Double.valueOf(df.format(MinVtBalun)));
         if (MinVtBalun<15){
             singleLoopReportOneVo.setMinVtBalunStatus(true);
         }else {
@@ -1039,12 +1039,12 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         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);
-        singleLoopReportOneVo.setQrF(OverrunF==0?00.00:Double.valueOf(OverrunF)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
-        singleLoopReportOneVo.setQrElBalun(OverrunElBalun==0?00.00:Double.valueOf(OverrunElBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
-        singleLoopReportOneVo.setQrVtBalun(OverrunVtBalun==0?00.00:Double.valueOf(OverrunVtBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
+        singleLoopReportOneVo.setQrUa(OverrunUa==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunUa)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100)));
+        singleLoopReportOneVo.setQrUb(OverrunUb==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunUb)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100)));
+        singleLoopReportOneVo.setQrUc(OverrunUc==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunUc)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100)));
+        singleLoopReportOneVo.setQrF(OverrunF==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunF)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100)));
+        singleLoopReportOneVo.setQrElBalun(OverrunElBalun==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunElBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()))));
+        singleLoopReportOneVo.setQrVtBalun(OverrunVtBalun==0?00.00: Double.valueOf(df.format(Double.valueOf(OverrunVtBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()))));
         singleLoopReportOneVo.setVoltageLevelToplimit(voltageLevel+voltageLevelWanting);
         singleLoopReportOneVo.setVoltageLevelLowerLimit(voltageLevel-voltageLevelWanting);
         singleLoopReportOneVo.setMhz(50.00);