监视模块产品化计算服务修改

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

@@ -3,7 +3,6 @@ package com.gyee.frame.service.websocket;
 
 import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
-import com.gyee.frame.common.spring.ConstantTR;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.DNAVal;
@@ -364,13 +363,17 @@ public class GenreSetPushService {
 
             if (id.equals(QS)) {
                 // 减排二氧化碳
-                int jpeyht = (int) (realApiUtil.getRealData(ConstantTR.JPEYHT).getPointValueInDouble() * 10000);
+                Windpowerstationpointnew temppoint= windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHT);
+                int jpeyht = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
                 // 节约标煤
-                int jybm = (int)(realApiUtil.getRealData(ConstantTR.JYBM).getPointValueInDouble() * 10000);
+                temppoint= windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYBM);
+                int jybm = (int)(realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
                 // 减排二氧化硫
-                int jpeyhl = (int)(realApiUtil.getRealData(ConstantTR.JPEYHL).getPointValueInDouble() * 10000);
+                temppoint= windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHL);
+                int jpeyhl = (int)(realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
                 // 节约水
-                int jys = (int)(realApiUtil.getRealData(ConstantTR.JYS).getPointValueInDouble() * 10000);
+                temppoint= windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYS);
+                int jys = (int)(realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
 
 //                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
 //
@@ -385,7 +388,8 @@ public class GenreSetPushService {
             }
 
             // 安全天数
-            Double aqts = realApiUtil.getRealData(ConstantTR.AQTS).getPointValueInDouble();
+            Windpowerstationpointnew temppoint= windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_AQTS);
+            Double aqts = realApiUtil.getRealData(temppoint).getPointValueInDouble();
             jczbmap.put("aqts", StringUtils.round(aqts, 2));
             if (bzgl == 0.0) {
                 bzgl = 1.0;

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

@@ -94,6 +94,26 @@ public class WpInfoPushService {
         for (Windpowerstation wp : InitialRunner.wpallls) {
 
             ZtjsVo vo = new ZtjsVo();
+
+
+            vo.setFdl(0.0);
+            vo.setSwdl(0.0);
+            vo.setLyxs(0.0);
+            vo.setFs(0.0);
+            vo.setGl(0.0);
+            vo.setCxgl(0.0);
+            vo.setLlgl(0.0);
+            vo.setBzgl(0.0);
+            vo.setYcgl(0.0);
+            vo.setAGCzl(0.0);
+            vo.setLlfdl(0.0);
+            vo.setScadafdl(0.0);
+            vo.setWhss(0.0);
+            vo.setGzss(0.0);
+            vo.setSlss(0.0);
+            vo.setXdss(0.0);
+            vo.setXnss(0.0);
+
             String id = wp.getId();
             double scadafdl = 0.0;
             Double zjrl = 0.0;