Browse Source

海子井接入

chenminghua 3 years ago
parent
commit
40d5c35b66

+ 5 - 0
src/main/java/com/gyee/frame/common/spring/ConstantTR.java

@@ -312,6 +312,11 @@ public class ConstantTR {
 	public static final String XHZ315 = "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0029"; // 35kV3#进线315开关位置
 	/******************************************** 宣和风电场 *****************************************/
 
+	/******************************************** 海子井风电场 *****************************************/
+	public static final String HZJWD = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; // 宣和测风塔温度
+	public static final String HZJPJFS = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; // 宣和平均风速
+	/******************************************** 海子井风电场 *****************************************/
+
 	/******************************************** 香山风电场 *****************************************/
 	public static final String XSRFDL = "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0088"; // 香山日发电量
 	public static final String XSYFDL = "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0146"; // 香山月发电量

+ 3 - 1
src/main/java/com/gyee/frame/common/spring/WpEnum.java

@@ -10,7 +10,9 @@ public  enum  WpEnum {
     DWK_GDC("DWK_GDC"),
     PL_GDC("PL_GDC"),
     XH_GDC("XH_GDC"),
-    MCH_GDC("MCH_GDC");
+    MCH_GDC("MCH_GDC"),
+    HZJ_GDC("HZJ_GDC");
+
     public String id;
     WpEnum(final  String c) {
         id = c;

+ 6 - 0
src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1879,6 +1879,12 @@ private   Map<String, Double> getHbWs(String id) throws Exception {
                     retValue.put("hb", 1385.0);
                     ptValue = realApiUtil.getRealData(ConstantTR.XHPJFS);
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+                }  else if (wpId.equals(WpEnum.HZJ_GDC.name())) {
+                    ptValue = realApiUtil.getRealData(ConstantTR.HZJWD);
+                    retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
+                    retValue.put("hb", 1385.0);
+                    ptValue = realApiUtil.getRealData(ConstantTR.HZJPJFS);
+                    retValue.put("ssfs", 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));