修改河北监视模块

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -1006,8 +1006,8 @@ public class WpInfoPushService {
                     }
 
                     List<String> fjzbls = new ArrayList<>();
-                    List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wp.getId());
-                    for(Windturbine wt:wtls) {
+                    List<Inverter> wtls=InitialRunner.gp_nbqmap.get(wp.getId());
+                    for(Inverter wt:wtls) {
 
                         //状态
                         fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getCode());
@@ -1074,6 +1074,25 @@ public class WpInfoPushService {
 
                     double jrts=dj + yx + xd + gz + wh + sl + lx;
                     jczbmap.put("jrts",Double.valueOf(jrts).intValue() );
+                }else
+                {
+                    List<String> gfjczbls = new ArrayList<>();
+
+                    gfjczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_JPEYHT).getCode());
+                    gfjczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_JPEYHL).getCode());
+                    gfjczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_JYS).getCode());
+                    gfjczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_JPEYHT).getCode());
+                    List<PointData> gfzblist = realApiUtil.getRealData(gfjczbls);
+                    if (!gfzblist.isEmpty() && gfzblist.size() == gfjczbls.size()) {
+                        //节约二氧化碳
+                        jczbmap.put("jyeyht", StringUtils.round(gfzblist.get(0).getPointValueInDouble(),2));
+                        //节约二氧化硫
+                        jczbmap.put("jyeyhl", StringUtils.round(gfzblist.get(1).getPointValueInDouble(),2));
+                        //节约标煤
+                        jczbmap.put("jybm", StringUtils.round(gfzblist.get(2).getPointValueInDouble(),2));
+                        //节约用水
+                        jczbmap.put("jyys", StringUtils.round(gfzblist.get(3).getPointValueInDouble(),2));
+                    }
                 }
 
 //
@@ -1402,10 +1421,10 @@ public class WpInfoPushService {
 
 /*************************************************风机矩阵指标**************************************************************/
 
-
-            Map<String, Object> fjjzmap = matrixPushByWpService.findSimpleMatrixById(wp.getId());
-
-            map.put("fjjzmap", fjjzmap);
+//
+//            Map<String, Object> fjjzmap = matrixPushByWpService.findSimpleMatrixById(wp.getId());
+//
+//            map.put("fjjzmap", fjjzmap);
 /*************************************************风机矩阵指标**************************************************************/
 
 /*************************************************功率曲线**************************************************************/