横屏功率测点更换

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/bigscreen/BigScreenService.java

@@ -196,11 +196,12 @@ public class BigScreenService {
         double nssgl = ednaApiUtil.getRealData(MainConstant.NSSDQ_POWER).getPointValueInDouble();// 牛首山总功率
         double qsgl= ednaApiUtil.getRealData(MainConstant.QSDQ_POWER).getPointValueInDouble();// 青山总功率
         double sbqgl = ednaApiUtil.getRealData(MainConstant.SBQDQ_POWER).getPointValueInDouble();// 石板泉总功率
+        double sbqgl2 = ednaApiUtil.getRealData(MainConstant.SBQDQ_POWER2).getPointValueInDouble();// 石板泉总功率
         double xsgl = ednaApiUtil.getRealData(MainConstant.XSDQ_POWER).getPointValueInDouble();// 香山总功率
         map.put("mhsgl",mhsgl);
         map.put("nssgl",nssgl);
         map.put("qsgl",qsgl);
-        map.put("sbqgl",sbqgl*10);
+        map.put("sbqgl",sbqgl+sbqgl2);
         map.put("xsgl",xsgl);
         double gfssgl = ednaApiUtil.getRealData(MainConstant.JSFW_GFSSZGL).getPointValueInDouble();// 总功率合计
         double gfrfdl = ednaApiUtil.getRealData(MainConstant.JSFW_GFRFDLB).getPointValueInDouble();// 光伏日发电量合计

gradeevaluation/src/main/java/com/gyee/gradeevaluation/variable/MainConstant.java

@@ -26,13 +26,14 @@ public class MainConstant {
     public static final String JSFW_NSSWDLB = "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0136"; // 牛首山上网电量
     public static final String JSFW_NSSSZGL = "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0135"; //牛首山实时总功率
     public static final String JSFW_NSSSFS = "NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0134"; // 牛首山实时平均风速
-    public static final String NSSDQ_POWER = "NSSDQ.NX_GD_NSSF_DQ_P1_L1_001_AI1009"; // 牛首山原始测点总功率
+    public static final String NSSDQ_POWER = "NSSDQN.NX_GD_NSSF_DQ_P1_L1_001_AI1009"; // 牛首山原始测点总功率
 
     public static final String JSFW_MHRFDLB = "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0088"; // 麻黄山日发电量
     public static final String JSFW_MHSWDLB = "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0136"; // 麻黄山上网电量
     public static final String JSFW_MHSSZGL = "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0135"; // 麻黄山总功率
     public static final String JSFW_MHSSFS = "MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0134"; // 麻黄山风速
-    public static final String MHSDQ_POWER = "MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0013"; // 麻黄山原始测点总功率
+    public static final String MHSDQ_POWER = "MHSDQ.NX_GD_MHSF_DQ_P1_L1_001_AI0013"; // 麻黄山原始测点总功率
+
 
     public static final String JSFW_QSRFDLB = "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0088"; // 青山日发电量(升压站)
     public static final String JSFW_QSSWDLB = "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0136"; // 青山上网电量
@@ -44,7 +45,8 @@ public class MainConstant {
     public static final String JSFW_SBSWDLB = "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0136"; // 石板泉上网电量
     public static final String JSFW_SBSSZGL = "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0135"; // 石板泉实时总功率
     public static final String JSFW_SBSSFS = "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0134"; // 石板泉实时平均风速
-    public static final String SBQDQ_POWER = "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0684"; // 石板泉原始测点总功率
+    public static final String SBQDQ_POWER = "SBQNWDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0044"; // 石板泉原始测点总功率
+    public static final String SBQDQ_POWER2 = "SBQXLDQ.NX_GD_SBQF_DQ_P1_L1_001_AI0012"; // 石板泉原始测点总功率
 
     public static final String JSFW_DWRFDLB = "DWKGDCJSFW.NX_GD_DWKG_XX_XX_XXX_XXX_CI0088"; // 大武口日发电量(升压站)
     public static final String JSFW_DWSWDLB = "DWKGDCJSFW.NX_GD_DWKG_XX_XX_XXX_XXX_CI0136"; // 大武口上网电量