发电量除10000

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/Constant.java

@@ -219,6 +219,8 @@ public static final String[] TPOINT_WP_AGC = { "AGC001", "AGC002",
 	public static final String YWZSSDL = "YWZZSDL"; // 月场外受累电网
 	public static final String YTZSSDL = "YTZZSDL"; // 月场外受累天气
 
+	public static final String FNLYL = "FNLYL"; // 风能利用率
+
 	public static final String NLZSSDL = "NLZZSDL"; // 年场内受累检修
 	public static final String NSZSSDL = "NSZZSDL"; // 年场内受累故障
 	public static final String NWZSSDL = "NWZZSDL"; // 年场外受累电网

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -2192,13 +2192,13 @@ public class GenreSetPushService {
                 sjgl = MathUtil.twoBit(jczblist.get(0).getPointValueInDouble());
                 jczbmap.put("sjgl", sjgl);
                 //日发电量
-                rfdl = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble());
+                rfdl = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble()/10000);
                 jczbmap.put("rfdl", rfdl);
                 //月发电量
-                yfdl = MathUtil.twoBit(jczblist.get(2).getPointValueInDouble());
+                yfdl = MathUtil.twoBit(jczblist.get(2).getPointValueInDouble()/10000);
                 jczbmap.put("yfdl", yfdl);
                 //年发电量
-                nfdl = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble());
+                nfdl = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble()/10000);
                 jczbmap.put("nfdl", nfdl);
                 if (zjrl != 0) {
                     //月利用小时
@@ -2362,8 +2362,8 @@ public class GenreSetPushService {
             //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
             c = Calendar.getInstance();
             double yycfdl = (yfdl + rycfdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
-            jczbmap.put("rycfdl", MathUtil.twoBit(rycfdl));
-            jczbmap.put("yycfdl", MathUtil.twoBit(yycfdl));
+            jczbmap.put("rycfdl", MathUtil.twoBit(rycfdl/10000));
+            jczbmap.put("yycfdl", MathUtil.twoBit(yycfdl/10000));
 
             map.put("jczbmap", jczbmap);
 
@@ -2853,6 +2853,8 @@ public class GenreSetPushService {
             wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NWZSSDL).getCode());
             // 年场外受累天气
             wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.NTZSSDL).getCode());
+            //风能利用率
+            wxssls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FNLYL).getCode());
 
             List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
 
@@ -2982,8 +2984,10 @@ public class GenreSetPushService {
 
                 double yllfdl = yfdl + ygzssdl + yjxssdl + yqfssdl + yxdssdl + yslssdl;
                 if (yllfdl != 0) {
-                    double yfnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+//                    double yfnlyl = new BigDecimal(yfdl).divide(new BigDecimal(yllfdl), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+                    double yfnlyl = MathUtil.twoBit(wxsslist.get(33).getPointValueInDouble());
                     wxssmap.put("yfnlyl", yfnlyl);
+
                 } else {
                     wxssmap.put("yfnlyl", 0.0);
                 }