首页增加公司字段

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

@@ -114,31 +114,19 @@ public class MonitorService {
                     String id = wp.getId();
                     if (CacheContext.wpmap.containsKey(id) && id.endsWith("FDC_STA")) {
                         xx.put("name", wp.getName());
+                        xx.put("companyid", wp.getCompanyId());
                         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("companyid", wp.getCompanyId());
                         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();
@@ -1385,11 +1373,11 @@ public class MonitorService {
         SimpleDateFormat format = new SimpleDateFormat("yyyy");
 
         Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.YEAR, -2);
+        cal.add(Calendar.YEAR, -2);
         Date beginDate = cal.getTime();
 
         Calendar call = Calendar.getInstance();
-        cal.set(Calendar.YEAR, 1);
+        cal.add(Calendar.YEAR, 1);
 
         Date endDate = call.getTime();