驾驶舱 海子井功率 取测点五主变高压侧

src/main/java/com/gyee/SpringbootStart.java

@@ -23,13 +23,13 @@ public class SpringbootStart {
         SpringApplication.run(SpringbootStart.class, args);
 
 
-        InitialRedis initialRedis=new InitialRedis();
-        System.out.println("初始化开始！");
-        initialRedis.intialWindturbinepowercurvefitting();
-        initialRedis.intialWpScatter();
-        initialRedis.intialPjScatter();
-        initialRedis.intialLnScatter();
-        initialRedis.intialWtScatter();
+//        InitialRedis initialRedis=new InitialRedis();
+//        System.out.println("初始化开始！");
+//        initialRedis.intialWindturbinepowercurvefitting();
+//        initialRedis.intialWpScatter();
+//        initialRedis.intialPjScatter();
+//        initialRedis.intialLnScatter();
+//        initialRedis.intialWtScatter();
 //        System.out.println("初始化完成！");
     }
 }

src/main/java/com/gyee/frame/common/spring/ConstantTR.java

@@ -315,7 +315,8 @@ public class ConstantTR {
 
 	/******************************************** 海子井风电场 *****************************************/
 	public static final String HZJWD = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ005"; // 海子井测风塔温度
-	public static final String HZJPJFS = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ007"; // 海子井平均风速
+	public static final String HZJPJFS = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ001"; // 海子井光照强度
+	public static final String HZJGL = "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052";//海子井功率（5号主变高压侧）
 	/******************************************** 海子井风电场 *****************************************/
 
 	/******************************************** 香山风电场 *****************************************/

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -2122,6 +2122,11 @@ public class GenreSetPushService {
 //
 //                }
                 PointData ptValue =null;
+
+                WindPowerStationTestingPoint2 glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+                ptValue = realApiUtil.getRealData(glpoint.getCode());
+                retValue.put("gl", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+
                 if (wpId.equals(WpEnum.MHS_FDC.name())) {
                     ptValue = realApiUtil.getRealData(ConstantTR.MHSFGL_AI000305);
                     retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
@@ -2177,6 +2182,8 @@ public class GenreSetPushService {
                     retValue.put("hb", 1385.0);
                     ptValue = realApiUtil.getRealData(ConstantTR.HZJPJFS);
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+                    ptValue = realApiUtil.getRealData(ConstantTR.HZJGL);
+                    retValue.put("gl", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 } else if (wpId.equals(WpEnum.XS_FDC.name())) {
                     ptValue = realApiUtil.getRealData(ConstantTR.XSWD);
                     retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
@@ -2185,9 +2192,6 @@ public class GenreSetPushService {
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 }
 
-                WindPowerStationTestingPoint2 glpoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
-                ptValue = realApiUtil.getRealData(glpoint.getCode());
-                retValue.put("gl", StringUtils.round(ptValue.getPointValueInDouble(), 0));
             }
             resultmap.put(wpId,retValue);
         }