首页修改

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

@@ -1992,64 +1992,119 @@ public class MonitorService {
 
             setPlanInfoByType(planmap, pjls, wpId);
 
-            for (ProBasicPowerstation wp : wplist) {
+            if (wpId.endsWith(QS) || wpId.endsWith(FD) || wpId.endsWith(GF)) {
 
-                if (planmap.containsKey(wp.getId())) {
-                    Map<String, Double> valuemap = planmap.get(wp.getId());
+                double rfdlsj = 0.0;
+                double yfdlsj = 0.0;
+                double nfdlsj = 0.0;
 
-                    double yfdljh = 0.0;
-                    double rfdlsj = 0.0;
-                    double yfdlsj = 0.0;
-                    double nfdljh = 0.0;
-                    double nfdlsj = 0.0;
-                    if (valuemap.containsKey("yfdljh")) {
-                        yfdljh = valuemap.get("yfdljh");
-                    }
-                    if (valuemap.containsKey("nfdljh")) {
-                        nfdljh = valuemap.get("nfdljh");
-                    }
-                    if (wp.getId().indexOf("FDC_STA") >= 0) {
-                        //日发电量
-                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
-                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-
-                        fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
-                        fd_y_jhdl = fd_y_jhdl + yfdljh;
-                        fd_n_jhdl = fd_n_jhdl + nfdljh;
-
-                        fd_r_sjdl = fd_r_sjdl + rfdlsj;
-                        fd_y_sjdl = fd_y_sjdl + yfdlsj;
-                        fd_n_sjdl = fd_n_sjdl + nfdlsj;
-                    } else {
-                        //日发电量
-                        ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
-                        rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
-                        //月发电量
-                        ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
-                        yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
-
-                        //年发电量
-                        ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
-                        nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
-
-                        gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
-                        gf_y_jhdl = gf_y_jhdl + yfdljh;
-                        gf_n_jhdl = gf_n_jhdl + nfdljh;
-
-                        gf_r_sjdl = gf_r_sjdl + rfdlsj;
-                        gf_y_sjdl = gf_y_sjdl + yfdlsj;
-                        gf_n_sjdl = gf_n_sjdl + nfdlsj;
-                    }
+                double gfrfdlsj = 0.0;
+                double gfyfdlsj = 0.0;
+                double gfnfdlsj = 0.0;
 
+                String  fdstr = null;
+                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)) {
+                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
+                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                    //月发电量
+                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.YFDL);
+                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+                    //年发电量
+                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.NFDL);
+                    nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                    ProBasicPowerstationPoint gfrfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.RFDL);
+                    gfrfdlsj = edosUtil.getRealData(gfrfdlvalue).getPointValueInDouble();
+                    //月发电量
+                    ProBasicPowerstationPoint gfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.YFDL);
+                    gfyfdlsj = edosUtil.getRealData(gfdlvalue).getPointValueInDouble();
+                    //年发电量
+                    ProBasicPowerstationPoint gfnfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(gfstr, ContantXk.NFDL);
+                    gfnfdlsj = edosUtil.getRealData(gfnfdlvalue).getPointValueInDouble();
+                } else if (wpId.endsWith(FD) || wpId.endsWith(GF)) {
+                    ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.RFDL);
+                    rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                    //月发电量
+                    ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, ContantXk.YFDL);
+                    yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+                    //年发电量
+                    ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(fdstr, 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 + gfrfdlsj;
+                gf_y_sjdl = gf_y_sjdl + gfyfdlsj;
+                gf_n_sjdl = gf_n_sjdl + gfnfdlsj;
+            } else {
+
+                for (ProBasicPowerstation wp : wplist) {
+
+                    if (planmap.containsKey(wp.getId())) {
+                        Map<String, Double> valuemap = planmap.get(wp.getId());
+
+                        double yfdljh = 0.0;
+                        double rfdlsj = 0.0;
+                        double yfdlsj = 0.0;
+                        double nfdljh = 0.0;
+                        double nfdlsj = 0.0;
+                        if (valuemap.containsKey("yfdljh")) {
+                            yfdljh = valuemap.get("yfdljh");
+                        }
+                        if (valuemap.containsKey("nfdljh")) {
+                            nfdljh = valuemap.get("nfdljh");
+                        }
+                        if (wp.getId().indexOf("FDC_STA") >= 0) {
+                            //日发电量
+                            ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                            rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                            //月发电量
+                            ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+                            yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+                            //年发电量
+                            ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+                            nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                            fd_r_jhdl = fd_r_jhdl + yfdljh / 30;
+                            fd_y_jhdl = fd_y_jhdl + yfdljh;
+                            fd_n_jhdl = fd_n_jhdl + nfdljh;
+
+                            fd_r_sjdl = fd_r_sjdl + rfdlsj;
+                            fd_y_sjdl = fd_y_sjdl + yfdlsj;
+                            fd_n_sjdl = fd_n_sjdl + nfdlsj;
+                        } else {
+                            //日发电量
+                            ProBasicPowerstationPoint rfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.RFDL);
+                            rfdlsj = edosUtil.getRealData(rfdlvalue).getPointValueInDouble();
+                            //月发电量
+                            ProBasicPowerstationPoint yfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.YFDL);
+                            yfdlsj = edosUtil.getRealData(yfdlvalue).getPointValueInDouble();
+
+                            //年发电量
+                            ProBasicPowerstationPoint nfdlvalue = proBasicPowerstationPointService.getPowerstationPoint(wp.getId(), ContantXk.NFDL);
+                            nfdlsj = edosUtil.getRealData(nfdlvalue).getPointValueInDouble();
+
+                            gf_r_jhdl = gf_r_jhdl + yfdljh / 30;
+                            gf_y_jhdl = gf_y_jhdl + yfdljh;
+                            gf_n_jhdl = gf_n_jhdl + nfdljh;
+
+                            gf_r_sjdl = gf_r_sjdl + rfdlsj;
+                            gf_y_sjdl = gf_y_sjdl + yfdlsj;
+                            gf_n_sjdl = gf_n_sjdl + nfdlsj;
+                        }
+
+
+                    }
+
+                }
             }
 
             if (wpId.contains("FL")) {

web/runeconomy-xk/src/main/resources/application-jn.yml

@@ -96,5 +96,5 @@ logging:
     com.example: debug
 initialcode: INITIAL
 db:
-  baseURL: http://localhost:8011/ts
-  baseURL1: http://localhost:8011/ts
+  URL1: http://10.81.3.152:8098/ts
+  URL2: http://10.81.3.152:8099/ts