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

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

@@ -1032,7 +1032,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         singleLoopReportOneVo.setMhz(50.00);
         singleLoopReportOneVo.setFToplimit(50.2);
         singleLoopReportOneVo.setFLowerLimit(49.8);
-        singleLoopReportOneVo.setAppraise(0.9);
+        singleLoopReportOneVo.setAppraise(0.85);
         singleLoopReportOneVo.setBalanceToplimit(15.00);
         singleLoopReportOneVo.setBalanceLowerLimit(15.00);
         return singleLoopReportOneVo;

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

@@ -1110,6 +1110,9 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         return lastDate;
     }
 
+
+
+
     @Override
     public List<RealScoreVO> evaluationReport(int siteId, Date time, int type) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1134,6 +1137,21 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         return fillRealScoreDataTwo(evaluationReporVo);
     }
 
+    /**
+     * 计算电压分数2
+     *
+     * @return
+     */
+    public Boolean computeUScoreOne(Double qualified, Double voltageLevel) {
+//        double mul = Arith.mul(qualified, voltageLevel);
+        Double voltageLevels = voltageLevel+(voltageLevel / 100 * 7);
+        Double voltageLevelx = voltageLevel-(voltageLevel / 100 * 7);
+        if (voltageLevelx <= qualified && voltageLevels >= qualified) {
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public List<RealScoreVO> fillRealScoreDataTwo(List<EvaluationReporVo> evaluationReporVo) {
         List<RealScoreVO> realScoreVoList = new ArrayList<>();
@@ -1169,9 +1187,9 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
                 realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(), ratedCurrent));
                 //计算分数
                 //电压分数
-                realScoreVo.setUaQ(computeUScore(realScoreVo.getUaQualified(), voltageLevel));
-                realScoreVo.setUbQ(computeUScore(realScoreVo.getUbQualified(), voltageLevel));
-                realScoreVo.setUcQ(computeUScore(realScoreVo.getUcQualified(), voltageLevel));
+                realScoreVo.setUaQ(computeUScoreOne(realScoreVo.getUaQualified(), voltageLevel));
+                realScoreVo.setUbQ(computeUScoreOne(realScoreVo.getUbQualified(), voltageLevel));
+                realScoreVo.setUcQ(computeUScoreOne(realScoreVo.getUcQualified(), voltageLevel));
                 if (realScoreVo.getUaQ() && realScoreVo.getUbQ() && realScoreVo.getUcQ()) {
                     realScoreVo.setUQ(true);
                     score += 20;