二期风机状态取值修改

common/src/main/java/com/gyee/common/vo/monitor/MatrixPowerVo.java

@@ -20,6 +20,8 @@ public class MatrixPowerVo {
     private Double xdts;
     private Double slts;
     private Double lxts;
+    private Double jlts;
+    private Double qdts;
     private Double spped;
     private Double ycgl;
     private Double bzgl;

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -193,6 +193,8 @@ public class MatrixService {
                 Double jxts = 0.0;
                 Double xdts = 0.0;
                 Double lxts = 0.0;
+                Double jlts = 0.0;
+                Double qdts = 0.0;
 //                for (PointData zt : wtmxRealdatas){
 //                    if (zt.getPointValueInDouble() == 2.0){
 //                        bwts++;
@@ -380,6 +382,10 @@ public class MatrixService {
                         lxts++;
                     } else if (zt.getStatus() == 1.0){
                         tjts++;
+                    } else if (zt.getStatus() == 3.0) {
+                        jlts++;
+                    } else if (zt.getStatus() == 5.0) {
+                        qdts++;
                     }
                 }
                 powerVo.setBwts(bwts);
@@ -389,6 +395,8 @@ public class MatrixService {
                 powerVo.setXdts(xdts);
                 powerVo.setSlts(tjts);
                 powerVo.setLxts(lxts);
+                powerVo.setJlts(jlts);
+                powerVo.setQdts(qdts);
                 powerVo.setWtlist(volist);
                 qf0.updateAndGet(v -> new Double((double) (v + volist.stream().filter(i -> i.getSsqfzt() == 0).mapToDouble(MatrixVo::getQfdl).sum())));
                 qf1.updateAndGet(v -> new Double((double) (v + volist.stream().filter(i -> i.getSsqfzt() == 1).mapToDouble(MatrixVo::getQfdl).sum())));