光伏适配器修改，首页接口bug修改

web/monitor-web-sxjn/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -831,7 +831,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         if(StringUtils.notEmp(pointids) && !pointids.isEmpty() )
         {
 
-            if(!pointids.get(0).startsWith(FSGF) && !pointids.get(0).startsWith(JRGF) && !pointids.get(0).startsWith(GFFZGLYC))
+            if(!pointids.get(0).startsWith(FSGF) && !pointids.get(0).startsWith(JRGF) && !pointids.get(0).startsWith(GFFZGLYC) && !pointids.get(0).startsWith(GFFSGLYC))
             {
                 baseURL = V2Config.getBaseurl();
             }else

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

@@ -105,13 +105,21 @@ public class MonitorService {
                 for (ProBasicPowerstation wp : wpls1) {
                     Map<String, Double> xx = new LinkedHashMap<>();
                     String id = wp.getId();
-                    if (CacheContext.wpmap.containsKey(id)) {
-                        xx.put("zjts", Double.valueOf(wp.getWindQuantityLd()));
+                    if (CacheContext.wpmap.containsKey(id) && id.endsWith("FDC_STA")) {
+                        xx.put("zjts", Double.valueOf(wp.getJrwindQuantityLd()));
                         xx.put("zjrl", wp.getJrwindCapacity());
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
                         xx.put("gl", gl);
+                    }else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")){
+                        xx.put("zczjts", Double.valueOf(wp.getJrquantityZc()));
+                        xx.put("jzzjts", Double.valueOf(wp.getJrquantityJz()));
+                        xx.put("zjrl", wp.getJrCapacity());
+                        double gl = 0.0;
+                        ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
+                        gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
+                        xx.put("gl", gl);
                     }
                     station.put(id, xx);
                 }
@@ -716,7 +724,6 @@ public class MonitorService {
             double jr_gf_zcts = 0;
             double jr_gf_jzts = 0;
             if (!cplist.isEmpty()) {
-//                ProBasicCompany pg = cplist.get(0);
                 for (ProBasicCompany pg : cplist) {
 
                     //清洁能源风电装机容量