矩阵修改

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

@@ -727,6 +727,7 @@ public class MatrixService {
             Map<String, Object> proMap = new HashMap<>();
             MatrixProVo provo = new MatrixProVo();
             List<String> procodes = new ArrayList<>();
+            List<String> procodes1 = new ArrayList<>();
             Map<String, ProBasicPowerstationPoint> powerstationPointMap = propointmap.get(p.getId());
             procodes.add(powerstationPointMap.get(ContantXk.DJTS).getNemCode());
             procodes.add(powerstationPointMap.get(ContantXk.YXTS).getNemCode());
@@ -739,17 +740,25 @@ public class MatrixService {
                 procodes.add(powerstationPointMap.get(ContantXk.SSPJFS).getNemCode());
             } else if (powerstation.getWindType().equals("-2")) {
                 Map<String, ProBasicPowerstationPoint> powerstationPointMap1 = propointmap1.get(p.getWindpowerstationId());
-                procodes.add(powerstationPointMap1.get(ContantXk.GCGZQD).getNemCode());
+                procodes1.add(powerstationPointMap1.get(ContantXk.GCGZQD).getNemCode());
+                procodes.add(powerstationPointMap.get(ContantXk.SSPJGZD).getNemCode());
             }
             procodes.add(powerstationPointMap.get(ContantXk.SSZBZGL).getNemCode());
             procodes.add(powerstationPointMap.get(ContantXk.SSZNHGLZS).getNemCode());
             procodes.add(powerstationPointMap.get(ContantXk.SSZGL).getNemCode());
             List<PointData> prodatas = null;
+            List<PointData> prodatas1 = null;
             try {
                 prodatas = edosUtil.getRealData(procodes);
             } catch (Exception e) {
                 e.printStackTrace();
             }
+
+            try {
+                prodatas1 = edosUtil.getRealData(procodes1);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             if (StringUtils.isNotEmpty(prodatas)) {
                 provo.setDjts((int) prodatas.get(0).getPointValueInDouble());
                 provo.setBwts((int) prodatas.get(1).getPointValueInDouble());
@@ -758,7 +767,11 @@ public class MatrixService {
                 provo.setXdts((int) prodatas.get(4).getPointValueInDouble());
                 provo.setSlts((int) prodatas.get(5).getPointValueInDouble());
                 provo.setLxts((int) prodatas.get(6).getPointValueInDouble());
-                provo.setSpeed(prodatas.get(7).getPointValueInDouble());
+                if (wpid.contains("FDC_STA")) {
+                    provo.setSpeed(prodatas.get(7).getPointValueInDouble());
+                }else {
+                    provo.setSpeed(prodatas1.get(0).getPointValueInDouble());
+                }
                 provo.setBzgl(prodatas.get(8).getPointValueInDouble());
                 provo.setLlgl(prodatas.get(9).getPointValueInDouble());
                 provo.setSjgl(prodatas.get(10).getPointValueInDouble());