功率负荷调整

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

@@ -2171,35 +2171,42 @@ public class GenreSetPushService {
                 newpointmap.put("gf_y_jhfdl",StringUtils.round(gf_y_jhfdl,2));
                 //光伏年计划发电量
                 newpointmap.put("gf_n_jhfdl",StringUtils.round(gf_n_jhfdl,2));
-
-                if(jr_gf_zjrl!=0)
-                {
-                    double gffhl= new BigDecimal(jr_gf_sjgl).divide(new BigDecimal(jr_gf_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //光伏功率负荷率
-                    newpointmap.put("gf_fhl",StringUtils.round(gffhl*100,2));
-                }else
-                {
-                    newpointmap.put("gf_fhl",0.0);
-                }
-                if(jr_fd_zjrl!=0)
-                {
-                    double fdfhl= new BigDecimal(jr_fd_sjgl).divide(new BigDecimal(jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //风电功率负荷率
-                    newpointmap.put("fd_fhl",StringUtils.round(fdfhl*100,2));
-                }else
-                {
-                    newpointmap.put("fd_fhl",0.0);
-                }
-
-                if((jr_gf_zjrl+jr_fd_zjrl)!=0)
-                {
-                    double fdfhl= new BigDecimal(jr_gf_sjgl+jr_fd_sjgl).divide(new BigDecimal(jr_gf_zjrl+jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    //清洁能源功率负荷率
-                    newpointmap.put("qjny_fhl",StringUtils.round(fdfhl*100,2));
-                }else
-                {
-                    newpointmap.put("qjny_fhl",0.0);
-                }
+                //光伏负荷率
+                newpointmap.put("gf_fhl",StringUtils.round(jr_gf_sjgl,2));
+
+                newpointmap.put("fd_fhl",StringUtils.round(jr_fd_sjgl,2));
+
+                //清洁能源功率负荷率
+                newpointmap.put("qjny_fhl",StringUtils.round(jr_gf_sjgl+jr_fd_sjgl,2));
+
+//                if(jr_gf_zjrl!=0)
+//                {
+//                    double gffhl= new BigDecimal(jr_gf_sjgl).divide(new BigDecimal(jr_gf_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+//                    //光伏功率负荷率
+//                    newpointmap.put("gf_fhl",StringUtils.round(gffhl*100,2));
+//                }else
+//                {
+//                    newpointmap.put("gf_fhl",0.0);
+//                }
+//                if(jr_fd_zjrl!=0)
+//                {
+//                    double fdfhl= new BigDecimal(jr_fd_sjgl).divide(new BigDecimal(jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+//                    //风电功率负荷率
+//                    newpointmap.put("fd_fhl",StringUtils.round(fdfhl*100,2));
+//                }else
+//                {
+//                    newpointmap.put("fd_fhl",0.0);
+//                }
+//
+//                if((jr_gf_zjrl+jr_fd_zjrl)!=0)
+//                {
+//                    double fdfhl= new BigDecimal(jr_gf_sjgl+jr_fd_sjgl).divide(new BigDecimal(jr_gf_zjrl+jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+//                    //清洁能源功率负荷率
+//                    newpointmap.put("qjny_fhl",StringUtils.round(fdfhl*100,2));
+//                }else
+//                {
+//                    newpointmap.put("qjny_fhl",0.0);
+//                }
 
                 map.put("newpointmap",newpointmap);
 //                for (Windpowerstation wp : wplist) {