处理矩阵状态——增加光伏风电区分

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

@@ -33,6 +33,6 @@ public class MatrixHAPowerVo {
     private Double sjgl;
 //    private Double agc;
 //    private Double cxgl;
-//    private String czlx;
+    private String czlx;
     private List<MatrixVo> wtlist;
 }

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

@@ -97,6 +97,11 @@ public class MatrixHAService {
                 powerVo.setWpid(wp.getId());
                 powerVo.setWpname(wp.getAname());
                 powerVo.setOrderNum(wp.getOrderNum());
+                if (wp.getWindType().equals("-1")) {
+                    powerVo.setCzlx("-1");
+                } else if (wp.getWindType().equals("-2")) {
+                    powerVo.setCzlx("-2");
+                }
                 powerVo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrquantityJz() + wp.getJrquantityZc());