|
|
@@ -1902,7 +1902,9 @@ public class GenreSetPushService {
|
|
|
jr_fd_zygl = jr_fd_zygl + zygl;
|
|
|
} else {
|
|
|
|
|
|
- gf_r_fdl = gf_r_fdl + rfdl;
|
|
|
+// gf_r_fdl = gf_r_fdl + rfdl;
|
|
|
+// gf_r_fdl = gf_r_fdl + gf_y_sjfdl;
|
|
|
+ gf_r_fdl = gf_r_fdl;
|
|
|
gf_y_fdl = gf_y_fdl + yfdl;
|
|
|
gf_n_fdl = gf_n_fdl + nfdl;
|
|
|
|
|
|
@@ -1952,7 +1954,7 @@ public class GenreSetPushService {
|
|
|
// jr_fd_zygl=jr_fd_zygl+zygl;
|
|
|
} else {
|
|
|
// gf_r_ycdl = gf_r_ycdl + (rfdl * RYCFDLXS);
|
|
|
- gf_r_ycdl = gf_r_ycdl + (gf_y_jhfdl/30);
|
|
|
+ gf_r_ycdl = gf_r_ycdl ;
|
|
|
// gf_r_fdl =gf_r_fdl+rfdl ;
|
|
|
|
|
|
// double yycfdl = yfdljh * YCFDLXS;
|
|
|
@@ -1965,13 +1967,13 @@ public class GenreSetPushService {
|
|
|
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_jhfdl = gf_y_jhfdl + yfdljh;
|
|
|
+ gf_n_jhfdl = gf_n_jhfdl + nfdljh;
|
|
|
|
|
|
// gf_y_sjfdl = fd_y_sjfdl + yfdlsj;
|
|
|
- gf_y_sjfdl = fd_y_sjfdl /3;
|
|
|
+ gf_y_sjfdl = gf_y_sjfdl + yfdlsj;
|
|
|
// gf_n_sjfdl = fd_n_sjfdl + nfdlsj;
|
|
|
- gf_n_sjfdl = fd_n_sjfdl /3;
|
|
|
+ gf_n_sjfdl = gf_n_sjfdl + nfdlsj;
|
|
|
|
|
|
// jr_gf_sjgl=jr_gf_sjgl+sjgl;
|
|
|
// jr_gf_zygl=jr_gf_zygl+zygl;
|
|
|
@@ -2115,7 +2117,7 @@ public class GenreSetPushService {
|
|
|
//风场年预测发电量
|
|
|
newpointmap.put("fd_n_ycdl", StringUtils.round(fd_n_ycdl, 2));
|
|
|
//光伏日预测发电量
|
|
|
- newpointmap.put("gf_r_ycdl", StringUtils.round(gf_r_ycdl/30, 0));
|
|
|
+ newpointmap.put("gf_r_ycdl", StringUtils.round(gf_r_ycdl + gf_y_jhfdl/30, 0));
|
|
|
//光伏月预测发电量
|
|
|
newpointmap.put("gf_y_ycdl", StringUtils.round(gf_y_ycdl, 0));
|
|
|
//光伏年预测发电量
|
|
|
@@ -2128,7 +2130,7 @@ public class GenreSetPushService {
|
|
|
//风场年发电量
|
|
|
newpointmap.put("fd_n_fdl", StringUtils.round(fd_n_fdl, 2));
|
|
|
//光伏日发电量
|
|
|
- newpointmap.put("gf_r_fdl", StringUtils.round(gf_r_fdl, 2));
|
|
|
+ newpointmap.put("gf_r_fdl", StringUtils.round(gf_r_fdl+(gf_y_sjfdl/30), 2));
|
|
|
//光伏月发电量
|
|
|
newpointmap.put("gf_y_fdl", StringUtils.round(gf_y_fdl, 2));
|
|
|
//光伏年发电量
|
wangb