增加日计划电量取值

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

@@ -1628,16 +1628,45 @@ public class MonitorService {
                             bnsjdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getOutageHours).sum(); //本月实际电量合
                         }
                         ProjectplanVo vo = new ProjectplanVo();
-                        vo.setJhdl(StringUtils.round(bnjhdlsum,2));
-                        vo.setSjdl(StringUtils.round(bnsjdlsum,2));
+                        vo.setJhdl(StringUtils.round(bnjhdlsum, 2));
+                        vo.setSjdl(StringUtils.round(bnsjdlsum, 2));
                         vo.setHours(i);
                         vos.add(vo);
                         SortUtils.sort(vos, "hours", SortUtils.ASC);
                     }
                 }
+            }
+            if (timetype.contains("day")) {
+                if (!wplist.isEmpty()) {
+                    int day = 0;
+                    Calendar cal = Calendar.getInstance();
+                    int dom = cal.get(Calendar.DAY_OF_MONTH);//26
+                    int month2 = DateUtils.getMonth(new Date());//4
 
 
+
+                        double byjhdlsum = 0.0;
+                        double bysjdlsum = 0.0;
+                        for (ProBasicPowerstation wpls : wplist) {
+                            List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList(String.valueOf(month2)); //本月所有集合
+                            //本年所有集合
+                            List<ProBasicProjectPlan> currentjh = currentls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
+                            byjhdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
+                            bysjdlsum += currentjh.stream().mapToDouble(ProBasicProjectPlan::getOutageHours).sum(); //本月实际电量合
+                        }
+                            for (int i = dom; i>0;i--) {
+                            ProjectplanVo vo = new ProjectplanVo();
+                            vo.setJhdl(StringUtils.round(byjhdlsum / 30, 2));
+                            vo.setSjdl(StringUtils.round(bysjdlsum / 30, 2));
+                            vo.setHours(i);
+                            vos.add(vo);
+                            SortUtils.sort(vos, "hours", SortUtils.ASC);
+                        }
+
+                }
             }
+
+
         }
         return vos;