修改首页数据

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

@@ -1448,23 +1448,21 @@ public class MonitorService {
             zjrlmap.put("zjrl", zjrl);
 
 
-            for (int i = 0; i < 3; i++) {
-                PowercurveVo vo = new PowercurveVo();
-                vo.setLlgl(0.0); //理论功率
-                vo.setRfdl(0.0); //日发电量
-                vo.setYfdl(0.0); //月发电量
-                vo.setNfdl(0.0); //年发电量
-                vo.setBzgl(0.0); //保证功率
-                vo.setSjgl(0.0); //实际功率
-                vo.setSsfs(0.0); //实时风速
-                vo.setGzzs(0.0); //光照指数
-                vo.setFnlyl(0.0); //风能利用率
-                vo.setHours(i);  //时间戳
-                vo.setName(wpId);
-                vos.add(vo);
-            }
-
-
+//            for (int i = 0; i < 3; i++) {
+//                PowercurveVo vo = new PowercurveVo();
+//                vo.setLlgl(0.0); //理论功率
+//                vo.setRfdl(0.0); //日发电量
+//                vo.setYfdl(0.0); //月发电量
+//                vo.setNfdl(0.0); //年发电量
+//                vo.setBzgl(0.0); //保证功率
+//                vo.setSjgl(0.0); //实际功率
+//                vo.setSsfs(0.0); //实时风速
+//                vo.setGzzs(0.0); //光照指数
+//                vo.setFnlyl(0.0); //风能利用率
+//                vo.setHours(0);  //时间戳
+//                vo.setName(wpId);
+//                vos.add(vo);    }
+//
             Map<String, Map<String, ProBasicPowerstationPoint>> pointwpmap = CacheContext.pointwpmap;
             Map<String, ProBasicPowerstationPoint> wtpointmap = pointwpmap.get(wpId);
 
@@ -1492,6 +1490,22 @@ public class MonitorService {
                 double temp1 = 0;
                 double temp2 = 0;
 
+                for (int i = 0; i < 3; i++) {
+                    PowercurveVo vo2 = new PowercurveVo();
+                    vo2.setLlgl(0.0); //理论功率
+                    vo2.setRfdl(0.0); //日发电量
+                    vo2.setYfdl(0.0); //月发电量
+                    vo2.setNfdl(0.0); //年发电量
+                    vo2.setBzgl(0.0); //保证功率
+                    vo2.setSjgl(0.0); //实际功率
+                    vo2.setSsfs(0.0); //实时风速
+                    vo2.setGzzs(0.0); //光照指数
+                    vo2.setFnlyl(0.0); //风能利用率
+                    vo2.setHours(i);  //时间戳
+                    vo2.setName(wpId);
+                    vos.add(vo2);
+            }
+
                 if (!sj.isEmpty() && sj.size()==3) {
                     temp0 = sj.get(0).getPointValueInDouble();
                     temp1 = sj.get(1).getPointValueInDouble();
@@ -1499,6 +1513,7 @@ public class MonitorService {
                     vos.get(0).setNfdl(StringUtils.round(temp0 / zjrl, 2));
                     vos.get(1).setNfdl(StringUtils.round(temp1 / zjrl, 2));
                     vos.get(2).setNfdl(StringUtils.round(temp2 / zjrl, 2));
+
                 }
 
             }
@@ -1509,13 +1524,13 @@ public class MonitorService {
                 DateUtils.getMonthLast(new Date());//4.30
                 Date date = DateUtils.getCurrentDate();
 
-                for(int i = month1;i>0;i--){
+                for(int i = month1;i > 0;i--){
 
                     PointData data = edosUtil.getSectionData(month, DateUtils.getEndOfDay(DateUtils.getMonthLast(date)).getTime());
-                    PowercurveVo vo = new PowercurveVo();
-                    vo.setYfdl(DoubleUtils.keepPrecision(data.getPointValueInDouble(),2));
-                    vo.setHours(i);
-                    vos.add(vo);
+                    PowercurveVo vo1 = new PowercurveVo();
+                    vo1.setYfdl(DoubleUtils.keepPrecision(data.getPointValueInDouble(),2));
+                    vo1.setHours(i);
+                    vos.add(vo1);
                     date = DateUtils.addMonths(date,-1);
                 }
                 SortUtils.sort(vos,"hours",SortUtils.ASC);
@@ -1554,6 +1569,55 @@ public class MonitorService {
 
     //计划电量
     public List<PowercurveVo> planvalue(String wpId, String timetype) throws Exception {
+
+//        List<ProBasicProjectPlan> pjls = proBasicProjectPlanService.getList(String.valueOf(year));
+//
+//        // 获取计划发电量信息
+//        Map<String, Map<String, Double>> planmap = new HashMap<>();
+//
+//        setPlanInfoByType(planmap, pjls, wpId);
+//
+//        for (ProBasicPowerstation wp : wplist) {
+//            if (planmap.containsKey(wp.getId())) {
+//                Map<String, Double> valuemap = planmap.get(wp.getId());
+//
+//                double yfdljh = 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("yfdlsj")) {
+//                    yfdlsj = valuemap.get("yfdlsj");
+//                }
+//                if (valuemap.containsKey("nfdljh")) {
+//                    nfdljh = valuemap.get("nfdljh");
+//                }
+//                if (valuemap.containsKey("nfdlsj")) {
+//                    nfdlsj = valuemap.get("nfdlsj");
+//                }
+//                if (wp.getId().indexOf("FDC_STA") >= 0) {
+//                    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 + yfdlsj / 30;
+//                    fd_y_sjdl = fd_y_sjdl + yfdlsj;
+//                    fd_n_sjdl = fd_n_sjdl + nfdlsj;
+//                } else {
+//                    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 + yfdlsj / 30;
+//                    gf_y_sjdl = gf_y_sjdl + yfdlsj;
+//                    gf_n_sjdl = gf_n_sjdl + nfdlsj;
+//                }
+//            }
+//
+//        }
+
         return null;
 
     }