光伏电量

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

@@ -1951,24 +1951,27 @@ public class GenreSetPushService {
 //                                    jr_fd_sjgl=jr_fd_sjgl+sjgl;
 //                                    jr_fd_zygl=jr_fd_zygl+zygl;
                                 } else {
-                                    gf_r_ycdl = gf_r_ycdl + (rfdl * RYCFDLXS);
+//                                    gf_r_ycdl = gf_r_ycdl + (rfdl * RYCFDLXS);
+                                    gf_r_ycdl = gf_r_ycdl + (gf_y_jhfdl/30);
 //                                    gf_r_fdl =gf_r_fdl+rfdl ;
 
 //                                    double yycfdl = yfdljh * YCFDLXS;
                                     double yycfdl = yfdljh;
 
-                                    gf_y_ycdl = gf_y_ycdl + yycfdl;
+                                    gf_y_ycdl = gf_y_ycdl + yfdljh;
 //                                    gf_y_fdl=gf_y_fdl+yfdl;
 //                                    double nycfdl = nfdljh * NYCFDLXS;
                                     double nycfdl = nfdljh;
-                                    gf_n_ycdl = gf_n_ycdl + nycfdl;
+                                    gf_n_ycdl = gf_n_ycdl + nfdljh;
 //                                    gf_n_fdl=gf_n_fdl+nfdl;
 
                                     gf_y_jhfdl = fd_y_jhfdl + yfdljh;
                                     gf_n_jhfdl = fd_n_jhfdl + nfdljh;
 
-                                    gf_y_sjfdl = fd_y_sjfdl + yfdlsj;
-                                    gf_n_sjfdl = fd_n_sjfdl + nfdlsj;
+//                                    gf_y_sjfdl = fd_y_sjfdl + yfdlsj;
+                                    gf_y_sjfdl = fd_y_sjfdl /3;
+//                                    gf_n_sjfdl = fd_n_sjfdl + nfdlsj;
+                                    gf_n_sjfdl = fd_n_sjfdl /3;
 
 //                                    jr_gf_sjgl=jr_gf_sjgl+sjgl;
 //                                    jr_gf_zygl=jr_gf_zygl+zygl;
@@ -2106,17 +2109,17 @@ public class GenreSetPushService {
                 newpointmap.put("jr_gf_jzts", StringUtils.round(jr_gf_jzts, 2));
 
                 //风场日预测发电量
-                newpointmap.put("fd_r_ycdl", StringUtils.round(fd_r_ycdl, 2));
+                newpointmap.put("fd_r_ycdl", StringUtils.round(fd_r_ycdl, 0));
                 //风场月预测发电量
                 newpointmap.put("fd_y_ycdl", StringUtils.round(fd_y_ycdl, 2));
                 //风场年预测发电量
                 newpointmap.put("fd_n_ycdl", StringUtils.round(fd_n_ycdl, 2));
                 //光伏日预测发电量
-                newpointmap.put("gf_r_ycdl", StringUtils.round(gf_r_ycdl, 2));
+                newpointmap.put("gf_r_ycdl", StringUtils.round(gf_r_ycdl/30, 0));
                 //光伏月预测发电量
-                newpointmap.put("gf_y_ycdl", StringUtils.round(gf_y_ycdl, 2));
+                newpointmap.put("gf_y_ycdl", StringUtils.round(gf_y_ycdl, 0));
                 //光伏年预测发电量
-                newpointmap.put("gf_n_ycdl", StringUtils.round(gf_n_ycdl, 2));
+                newpointmap.put("gf_n_ycdl", StringUtils.round(gf_n_ycdl, 0));
 
                 //风场日发电量
                 newpointmap.put("fd_r_fdl", StringUtils.round(fd_r_fdl, 2));