启动配置修改

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

@@ -113,11 +113,11 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.CWSLTQTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.LXTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.TXZDTSMX).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());
-            }
+//            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());
@@ -151,6 +151,8 @@ public class MatrixService {
                 List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
+
+
                 MatrixPowerVo powerVo = new MatrixPowerVo();
                 powerVo.setWpid(wp.getId());
                 powerVo.setWpname(wp.getAname());
@@ -168,10 +170,24 @@ public class MatrixService {
                 powerVo.setXdts(wpRealdatas.get(8).getPointValueInDouble() + wpRealdatas.get(9).getPointValueInDouble());
                 powerVo.setSlts(wpRealdatas.get(10).getPointValueInDouble() + wpRealdatas.get(11).getPointValueInDouble());
                 powerVo.setLxts(wpRealdatas.get(12).getPointValueInDouble() + wpRealdatas.get(13).getPointValueInDouble());
-                powerVo.setSpped(wpRealdatas.get(14).getPointValueInDouble());
-                powerVo.setBzgl(wpRealdatas.get(15).getPointValueInDouble());
-                powerVo.setLlgl(wpRealdatas.get(16).getPointValueInDouble());
-                powerVo.setSjgl(wpRealdatas.get(17).getPointValueInDouble());
+
+                powerVo.setBzgl(wpRealdatas.get(14).getPointValueInDouble());
+                powerVo.setLlgl(wpRealdatas.get(15).getPointValueInDouble());
+                powerVo.setSjgl(wpRealdatas.get(16).getPointValueInDouble());
+
+                if (wp.getWindType().equals("-1")) {
+                    PointData speed = edosUtil.getRealData(pointMap.get(ContantXk.SSPJFS).getNemCode());
+                    powerVo.setSpped(StringUtils.round(speed.getPointValueInDouble(),2));
+                } else if (wp.getWindType().equals("-2")) {
+                    PointData speed = edosUtil.getRealData(pointMap.get(ContantXk.GCGZQD).getNemCode());
+                    powerVo.setSpped(StringUtils.round(speed.getPointValueInDouble(),2));
+                }
+
+
+//                powerVo.setSpped(wpRealdatas.get(14).getPointValueInDouble());
+//                powerVo.setBzgl(wpRealdatas.get(15).getPointValueInDouble());
+//                powerVo.setLlgl(wpRealdatas.get(16).getPointValueInDouble());
+//                powerVo.setSjgl(wpRealdatas.get(17).getPointValueInDouble());
 //                powerVo.setYcgl(wpRealdatas.get(18).getPointValueInDouble());
 
                 AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);