添加是否合格

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

@@ -174,24 +174,38 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(),ratedCurrent));
         //计算分数
         //电压分数
-        if (computeUScore(realScoreVo.getUaQualified(),voltageLevel) && computeUScore(realScoreVo.getUbQualified(),voltageLevel)
-        && computeUScore(realScoreVo.getUcQualified(),voltageLevel)) {
+        realScoreVo.setUaQ(computeUScore(realScoreVo.getUaQualified(), voltageLevel));
+        realScoreVo.setUbQ(computeUScore(realScoreVo.getUbQualified(), voltageLevel));
+        realScoreVo.setUcQ(computeUScore(realScoreVo.getUcQualified(), voltageLevel));
+        if (realScoreVo.getUaQ() && realScoreVo.getUbQ() && realScoreVo.getUcQ()) {
+            realScoreVo.setUQ(true);
             score+=20;
+        }else {
+            realScoreVo.setUQ(false);
         }
         //电流分数
-        if (realScoreVo.getIaLoad() <= 0.8 && realScoreVo.getIbLoad() <= 0.8 && realScoreVo.getIcLoad() <= 0.8){
+        realScoreVo.setIaLoadQ(realScoreVo.getIaLoad() <= 0.8);
+        realScoreVo.setIbLoadQ(realScoreVo.getIbLoad() <= 0.8);
+        realScoreVo.setIcLoadQ(realScoreVo.getIcLoad() <= 0.8);
+        if (realScoreVo.getIaLoadQ() && realScoreVo.getIbLoadQ() && realScoreVo.getIcLoadQ()){
+            realScoreVo.setILoadQ(true);
             score+=20;
+        }else {
+            realScoreVo.setILoadQ(false);
         }
         //电压平衡分数
-        if (realScoreVo.getElBalun() <= 0.15){
+        realScoreVo.setElBalunQ(realScoreVo.getElBalun() <= 0.15);
+        if (realScoreVo.getElBalunQ()){
             score+=20;
         }
         //电流平衡分数
-        if (realScoreVo.getVtBalun() <= 0.15){
+        realScoreVo.setVtBalunQ(realScoreVo.getVtBalun() <= 0.15);
+        if (realScoreVo.getVtBalunQ()){
             score+=20;
         }
         //功率
-        if (realScoreVo.getCos() <= 0.15){
+        realScoreVo.setCosQ(realScoreVo.getCos() <= 0.15);
+        if (realScoreVo.getCosQ()){
             score+=20;
         }
         realScoreVo.setScore(score);

fiveep-service/src/main/java/com/bizmatics/service/vo/RealScoreVO.java

@@ -91,4 +91,56 @@ public class RealScoreVO {
      * 时间
      */
     private Date dataTime;
+
+    /**
+     * 电流不平衡度合格率
+     */
+    private Boolean elBalunQ;
+    /**
+     * 电压不平衡度合格率
+     */
+    private Boolean vtBalunQ;
+
+
+    /**
+     * A相电压合格率
+     */
+    private Boolean uaQ;
+
+    /**
+     * B相电压合格率
+     */
+    private Boolean ubQ;
+
+    /**
+     * C相电压合格率
+     */
+    private Boolean ucQ;
+    /**
+     * 功率因素合格率
+     */
+    private Boolean cosQ;
+
+
+    /**
+     * ia电流负载合格率
+     */
+    private Boolean iaLoadQ;
+    /**
+     * ib电流负载合格率
+     */
+    private Boolean ibLoadQ;
+    /**
+     * ic电流负载合格率
+     */
+    private Boolean icLoadQ;
+
+    /**
+     * 电压合格率平衡度
+      */
+    private Boolean uQ;
+    /**
+     * 电流负载率平衡度
+     */
+    private Boolean iLoadQ;
 }