横屏功率测点更换

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/BenchmarkController.java

@@ -40,6 +40,10 @@ public class BenchmarkController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R zyzb(@RequestParam(value = "windPowerStation", required = false) String windPowerStation) {
 
+
+        if("0".equals(windPowerStation)){
+            windPowerStation = "";
+        }
         List<Map> resultlist = benchmarkService.zyzb(windPowerStation);
 
         return R.ok().data(resultlist);

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/auto/impl/BenchmarkServiceImpl.java

@@ -40,7 +40,7 @@ public class BenchmarkServiceImpl extends ServiceImpl<BenchmarkMapper, Benchmark
                 "sum(utilizationhours) utilizationhours," +
                 "avg(availability) availability," +
                 " sum(mtbf) mtbf,sum(mttr) mttr");
-        if (null != windPowerStation && !"".equals(windPowerStation) && !"0".equals(windPowerStation)) {
+        if (null != windPowerStation && !"".equals(windPowerStation)) {
             wrapper.eq("foreignkeyid", windPowerStation);
         }
 

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

@@ -192,15 +192,15 @@ public class BigScreenService {
         map.put("qsfs",qsfs);
         map.put("sbqfs",sbqfs);
         map.put("xsfs",xsfs);
-        double mhsgl = ednaApiUtil.getRealData(MainConstant.JSFW_MHSSZGL).getPointValueInDouble();// 麻黄山总功率
-        double nssgl = ednaApiUtil.getRealData(MainConstant.JSFW_NSSSZGL).getPointValueInDouble();// 牛首山总功率
-        double qsgl= ednaApiUtil.getRealData(MainConstant.JSFW_QSSSZGL).getPointValueInDouble();// 青山总功率
-        double sbqgl = ednaApiUtil.getRealData(MainConstant.JSFW_SBSSZGL).getPointValueInDouble();// 石板泉总功率
-        double xsgl = ednaApiUtil.getRealData(MainConstant.JSFW_XSSSZGL).getPointValueInDouble();// 香山总功率
+        double mhsgl = ednaApiUtil.getRealData(MainConstant.MHSDQ_POWER).getPointValueInDouble();// 麻黄山总功率
+        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 xsgl = ednaApiUtil.getRealData(MainConstant.XSDQ_POWER).getPointValueInDouble();// 香山总功率
         map.put("mhsgl",mhsgl);
         map.put("nssgl",nssgl);
         map.put("qsgl",qsgl);
-        map.put("sbqgl",sbqgl);
+        map.put("sbqgl",sbqgl*10);
         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,21 +26,25 @@ 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 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 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"; // 青山上网电量
     public static final String JSFW_QSSSZGL = "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0135"; // 青山总功率
     public static final String JSFW_QSSSFS = "QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0134"; // 青山风速
+    public static final String QSDQ_POWER = "QSDQ.NX_GD_QSF_DQ_P1_L1_001_AI0330"; // 青山原始测点总功率
 
     public static final String JSFW_SBRFDLB = "SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0088"; // 石板泉日发电量(升压站)
     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 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"; // 大武口上网电量
@@ -94,6 +98,7 @@ public class MainConstant {
     public static final String JSFW_XSSWDLB = "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0136"; // 香山上网电量
     public static final String JSFW_XSSSZGL = "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0135"; // 香山实时总功率
     public static final String JSFW_XSSSFS = "XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0134"; // 香山实时平均风速
+    public static final String XSDQ_POWER = "XSDQ.NX_GD_XSF_DQ_P1_L1_001_AI0001"; // 香山原始测点总功率
 
 
     public static final String JSFW_XHYFDLB = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0146"; // 宣和月发电量