矩阵修改

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

@@ -578,6 +578,7 @@ public class MatrixService {
         Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(wpid);
         ProBasicPowerstation powerstation = wpmap.get(wpid);
         List<String> wpPoints = new ArrayList<>();
+        List<String> wpPoints1 = new ArrayList<>();
 
         wpPoints.add(pointMap.get(ContantXk.DJTSMX).getNemCode());
         wpPoints.add(pointMap.get(ContantXk.SDTJTSMX).getNemCode());
@@ -596,7 +597,8 @@ public class MatrixService {
         if (powerstation.getWindType().equals("-1")) {
             wpPoints.add(pointMap.get(ContantXk.SSPJFS).getNemCode());
         } else if (powerstation.getWindType().equals("-2")) {
-            wpPoints.add(pointMap.get(ContantXk.GCGZQD).getNemCode());
+            wpPoints.add(pointMap.get(ContantXk.SSPJGZD).getNemCode());
+            wpPoints1.add(pointMap.get(ContantXk.GCGZQD).getNemCode());
         }
         wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
         wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
@@ -604,6 +606,7 @@ public class MatrixService {
         wpPoints.add(pointMap.get(ContantXk.ZYCGL).getNemCode());
 
         List<PointData> realData = edosUtil.getRealData(wpPoints);
+        List<PointData> realData1 = edosUtil.getRealData(wpPoints1);
 
 
         //预测功率取值
@@ -676,11 +679,14 @@ public class MatrixService {
         resultMap.put("lxts", realData.get(12).getPointValueInDouble());
         resultMap.put("wzts", realData.get(13).getPointValueInDouble());
         resultMap.put("lxzts", realData.get(12).getPointValueInDouble() + realData.get(13).getPointValueInDouble());
-
-        resultMap.put("speed", realData.get(14).getPointValueInDouble());
+        if (wpid.contains("FDC_STA")) {
+            resultMap.put("speed", realData.get(14).getPointValueInDouble());
+        }else {
+            resultMap.put("speed", realData1.get(0).getPointValueInDouble());
+        }
         resultMap.put("bzgl", realData.get(15).getPointValueInDouble());
         resultMap.put("llgl", realData.get(16).getPointValueInDouble());
-        resultMap.put("sjgl", realData.get(17).getPointValueInDouble() / 1000);
+        resultMap.put("sjgl", realData.get(17).getPointValueInDouble() /1000);
         resultMap.put("ycgl", ycgl);
         AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
         AtomicReference<Double> agc = new AtomicReference<>((double) 0);