增加首页场站部分信息

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

@@ -78,6 +78,9 @@ public class MonitorService {
                         int i = 0;
 
                         czxx.put("zjrl", station.getCapacity());//装机容量
+                        czxx.put("scbwsj", station.getFirstGridTime());//首次并网时间
+                        czxx.put("zctysj", station.getWholeGridTime());//整场投运时间
+                        czxx.put("dlwz", station.getLongitude());
                         for (ProBasicProject p : project) {
                             Map qcls = new LinkedHashMap();
                             i++;
@@ -105,19 +108,35 @@ public class MonitorService {
             Map<String, Object> station = new LinkedHashMap<>();
             if (!wpls1.isEmpty()) {
                 for (ProBasicPowerstation wp : wpls1) {
-                    Map<String, Double> xx = new LinkedHashMap<>();
+                    Map<String, Object> xx = new LinkedHashMap<>();
                     String id = wp.getId();
                     if (CacheContext.wpmap.containsKey(id) && id.endsWith("FDC_STA")) {
+                        xx.put("name", wp.getName());
                         xx.put("zjts", Double.valueOf(wp.getJrwindQuantityLd()));
                         xx.put("zjrl", wp.getJrwindCapacity());
+                        xx.put("scbwsj", wp.getFirstGridTime());
+                        xx.put("zctysj", wp.getWholeGridTime());
+                        if (wp.getLongitude() == null){
+                            xx.put("dlwz",0);
+                        }else {
+                            xx.put("dlwz", wp.getLongitude() + wp.getLatitude());
+                        }
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
                         xx.put("gl", MathUtil.twoBit(gl));
                     } else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")) {
+                        xx.put("name", wp.getName());
                         xx.put("zczjts", Double.valueOf(wp.getJrquantityZc()));
                         xx.put("jzzjts", Double.valueOf(wp.getJrquantityJz()));
                         xx.put("zjrl", wp.getJrCapacity());
+                        xx.put("scbwsj", wp.getFirstGridTime());
+                        xx.put("zctysj", wp.getWholeGridTime());
+                        if (wp.getLongitude() == null){
+                            xx.put("dlwz",0);
+                        }else {
+                            xx.put("dlwz", wp.getLongitude() + wp.getLatitude());
+                        }
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();