首页修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -2006,10 +2006,10 @@ public class MonitorService {
                 String  gfstr = null;
 
                 String str = wpId;
-                fdstr = str.substring(0, str.indexOf("0")) + "-1";
-                gfstr = str.substring(0, str.indexOf("0")) + "-2";
 
                 if (wpId.endsWith(QS)) {
+                    fdstr = str.substring(0, str.indexOf("0")) + "-1";
+                    gfstr = str.substring(0, str.indexOf("0")) + "-2";
                     ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
                     rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
                     //月发电量
@@ -2027,23 +2027,33 @@ public class MonitorService {
                     //年发电量
                     ProBasicPowerstationPoint gfnfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.NFDL);
                     gfnfdlsj = edosUtil.getRealData(gfnfdlvalue).getPointValueInDouble();
+
+                    fd_r_sjdl = fd_r_sjdl + rfdlsj;
+                    fd_y_sjdl = fd_y_sjdl + yfdlsj;
+                    fd_n_sjdl = fd_n_sjdl + nfdlsj;
+
+                    gf_r_sjdl = gf_r_sjdl + gfrfdlsj;
+                    gf_y_sjdl = gf_y_sjdl + gfyfdlsj;
+                    gf_n_sjdl = gf_n_sjdl + gfnfdlsj;
                 } else if (wpId.endsWith(FD) || wpId.endsWith(GF)) {
-                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
+                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RFDL);
                     rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
                     //月发电量
-                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.YFDL);
+                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.YFDL);
                     yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
                     //年发电量
-                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.NFDL);
+                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.NFDL);
                     nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                    fd_r_sjdl = fd_r_sjdl + rfdlsj;
+                    fd_y_sjdl = fd_y_sjdl + yfdlsj;
+                    fd_n_sjdl = fd_n_sjdl + nfdlsj;
+
+                    gf_r_sjdl = gf_r_sjdl + rfdlsj;
+                    gf_y_sjdl = gf_y_sjdl + yfdlsj;
+                    gf_n_sjdl = gf_n_sjdl + nfdlsj;
                 }
-                fd_r_sjdl = fd_r_sjdl + rfdlsj;
-                fd_y_sjdl = fd_y_sjdl + yfdlsj;
-                fd_n_sjdl = fd_n_sjdl + nfdlsj;
 
-                gf_r_sjdl = gf_r_sjdl + gfrfdlsj;
-                gf_y_sjdl = gf_y_sjdl + gfyfdlsj;
-                gf_n_sjdl = gf_n_sjdl + gfnfdlsj;
             }
 
                 for (ProBasicPowerstation wp : wplist) {