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

web/monitor-web-hbnew/src/main/java/com/gyee/frame/common/spring/ConstantTR.java

@@ -12,7 +12,7 @@ package com.gyee.frame.common.spring;
 public class ConstantTR {
 
 	public static final String QSZSWDL = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0136"; // 全省上网电量
-	public static final String AQTS = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0220"; // 全省安全天数
+	public static final String AQTS = "HB_GD_QYG_JS_XX_XX_XXX_CI0182"; // 全省安全天数
 	public static final String QSZZGL = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0135"; // 全省总功率
 	public static final String QSZRFDL = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0088"; // 全省日累计发电量
 	public static final String QSZYFDL = "JSFW.NX_GD_XXX_XX_XX_XXX_XXX_CI0146"; // 全省月累计发电量

web/monitor-web-hbnew/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-hbnew/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;

web/monitor-web-hbnew/src/main/resources/application-dev.yml

@@ -12,16 +12,16 @@ spring:
         #        username: root
         #        password: 123456
 
-        #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+        url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
         #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
         #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-#        username: gdprod
-#        password: gd123
-#        driver-class-name: oracle.jdbc.driver.OracleDriver
-        url: jdbc:postgresql://10.81.3.151:5432/wisdom
         username: gdprod
         password: gd123
-        driver-class-name: org.postgresql.Driver
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+#        url: jdbc:postgresql://10.81.3.151:5432/wisdom
+#        username: gdprod
+#        password: gd123
+#        driver-class-name: org.postgresql.Driver
       #备数据源 #关闭
       slave:
         enabled: false

web/monitor-web-hbnew/src/main/resources/application.yml

@@ -39,7 +39,7 @@ gyee:
   #weatherurl: http://123.60.213.70:7011
   weatherurl: http://192.168.2.216:7011
   #weatherurl: http://10.83.68.97:7011
-  weatherqygs: nx_qygs
+  weatherqygs: hb_qygs
   hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
   initialcode: INITIAL
 #tomcat config