Browse Source

宣和马场胡更换光功率测点为原始点

wangchangsheng 3 years ago
parent
commit
0c9644f9ae

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

@@ -292,6 +292,7 @@ public class ConstantTR {
 	// 10#进线-断路器位置
 	/******************************************** 马场湖风电场 *****************************************/
 
+	public static final String MCHRZQD = "MCHGGL.NX_GD_MCHG_YC_P1_L1_001_QXZ001"; // 马场湖日照强度
 	/******************************************** 宣和风电场 *****************************************/
 	public static final String XHRFDL = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0088"; // 宣和日发电量
 	public static final String XHYFDL = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0146"; // 宣和月发电量

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

@@ -2163,13 +2163,13 @@ public class GenreSetPushService {
                     ptValue = realApiUtil.getRealData(ConstantTR.MCHWD);
                     retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                     retValue.put("hb", 1360.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.MCHPJFS);
+                    ptValue = realApiUtil.getRealData(ConstantTR.MCHRZQD);
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 } else if (wpId.equals(WpEnum.XH_GDC.name())) {
                     ptValue = realApiUtil.getRealData(ConstantTR.XHWD);
                     retValue.put("dqwd", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                     retValue.put("hb", 1385.0);
-                    ptValue = realApiUtil.getRealData(ConstantTR.XHPJFS);
+                    ptValue = realApiUtil.getRealData(ConstantTR.XHFS);
                     retValue.put("ssfs", StringUtils.round(ptValue.getPointValueInDouble(), 0));
                 }  else if (wpId.equals(WpEnum.HZJ_GDC.name())) {
                     ptValue = realApiUtil.getRealData(ConstantTR.HZJWD);