启动配置修改

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

@@ -425,11 +425,7 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.SLTS).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.TXZDTS).getNemCode());
 
-            if (wp.getWindType().equals("-1")) {
-                wpPoints.add(pointMap.get(ContantXk.SSPJFS).getNemCode());
-            } else if (wp.getWindType().equals("-2")) {
-                wpPoints.add(pointMap.get(ContantXk.GCGZQD).getNemCode());
-            }
+
 
             wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
@@ -460,10 +456,19 @@ public class MatrixService {
                 powerVo.setXdts(wpRealdatas.get(4).getPointValueInDouble());
                 powerVo.setSlts(wpRealdatas.get(5).getPointValueInDouble());
                 powerVo.setLxts(wpRealdatas.get(6).getPointValueInDouble());
-                powerVo.setSpped(wpRealdatas.get(7).getPointValueInDouble());
-                powerVo.setBzgl(wpRealdatas.get(8).getPointValueInDouble());
-                powerVo.setLlgl(wpRealdatas.get(9).getPointValueInDouble());
-                powerVo.setSjgl(wpRealdatas.get(10).getPointValueInDouble());
+
+                powerVo.setBzgl(wpRealdatas.get(7).getPointValueInDouble());
+                powerVo.setLlgl(wpRealdatas.get(8).getPointValueInDouble());
+                powerVo.setSjgl(wpRealdatas.get(9).getPointValueInDouble());
+
+
+                if (wp.getWindType().equals("-1")) {
+                    PointData wpReal = edosUtil.getRealData(pointMap.get(ContantXk.SSPJFS).getNemCode());
+                    powerVo.setSpped(wpReal.getPointValueInDouble());
+                } else if (wp.getWindType().equals("-2")) {
+                    PointData wpReal = edosUtil.getRealData(pointMap.get(ContantXk.GCGZQD).getNemCode());
+                    powerVo.setSpped(wpReal.getPointValueInDouble());
+                }
 //                powerVo.setYcgl(wpRealdatas.get(11).getPointValueInDouble());
                 AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
                 AtomicReference<Double> agc = new AtomicReference<>((double) 0);