Browse Source

埃肯横屏信息展示

wangchangsheng 2 years ago
parent
commit
9c10734d8d

+ 11 - 1
gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/bigscreen/BigScreenService.java

@@ -224,7 +224,12 @@ public class BigScreenService {
         double hzjfdl = ednaApiUtil.getRealData(MainConstant.JSFW_HZJRFDLB).getPointValueInDouble();
         double hzjgl = ednaApiUtil.getRealData(MainConstant.JSFW_HZJSSZGL).getPointValueInDouble();
         double hzjrzqd = ednaApiUtil.getRealData(MainConstant.HZJFS).getPointValueInDouble();
-        double gfrzqd = new BigDecimal(dwkrzqd + plrzqd + xhrzqd + mchrzqd + hzjrzqd) .divide(new BigDecimal(3), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+        double akfdl = ednaApiUtil.getRealData(MainConstant.JSFW_AKRFDLB).getPointValueInDouble();//埃肯发电量
+        double akgl = ednaApiUtil.getRealData(MainConstant.JSFW_AKSSZGL).getPointValueInDouble();//埃肯功率
+        double akrzqd = ednaApiUtil.getRealData(MainConstant.AKFS).getPointValueInDouble();//埃肯光照强度
+
+        double gfrzqd = new BigDecimal(dwkrzqd + plrzqd + xhrzqd + mchrzqd + hzjrzqd+akrzqd) .divide(new BigDecimal(3), 2, RoundingMode.HALF_EVEN).doubleValue();
         map.put("dwkgl",dwkgl);
         map.put("plgl",plgl);
         map.put("xhgl",xhgl-mchgl);
@@ -234,6 +239,11 @@ public class BigScreenService {
         map.put("hzjrzqd",hzjrzqd);
         map.put("gfrzqd",gfrzqd);
 
+        map.put("akfdl",akfdl);
+        map.put("akgl",akgl);
+        map.put("akrzqd",akrzqd);
+
+
         double fwjsl = 93.58;
         double zhjsl = 96.12;
         double xqjsl = 94.67;

+ 4 - 0
gradeevaluation/src/main/java/com/gyee/gradeevaluation/variable/MainConstant.java

@@ -70,6 +70,9 @@ public class MainConstant {
     public static final String JSFW_HZJSSFS = "HZJGDCJSFW.NX_GD_HZJG_XX_XX_XXX_XXX_CI0134"; //海子井日照强度
     public static final String JSFW_HZJSSZGL = "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"; //海子井总功率
 
+    public static final String JSFW_AKRFDLB = "AKGDCJSFW.NX_GD_AKG_XX_XX_XXX_XXX_CI0088"; //埃肯日发电量
+    public static final String JSFW_AKSSZGL = "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0139"; //埃肯总功率
+
 
 
     public static final String JSFW_XHRFDLB = "XHGDCJSFW.NX_GD_XHG_XX_XX_XXX_XXX_CI0088"; // 宣和日发电量
@@ -164,6 +167,7 @@ public class MainConstant {
     public static final String XHFS = "XHGGL.NX_GD_XHG_YC_P1_L1_001_QXZ001"; // 宣和日照强度
     public static final String MCHFS = "MCHGGL.NX_GD_MCHG_YC_P1_L1_001_QXZ001"; // 马场湖日照强度
     public static final String HZJFS = "HZJGGL.NX_GD_HZJG_YC_P1_L1_001_QXZ001"; // 海子井日照强度
+    public static final String AKFS = "AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0157"; // 埃肯日照强度
 
 
 }