|
@@ -201,13 +201,28 @@ public class LeaderboardService {
|
|
|
|
|
|
public List<StatisticalAnalysisTopVo> getWindturbineinfo(String wpIds, Date beginDate, Date endDate) {
|
|
public List<StatisticalAnalysisTopVo> getWindturbineinfo(String wpIds, Date beginDate, Date endDate) {
|
|
List<StatisticalAnalysisTopVo> ls=new ArrayList<>();
|
|
List<StatisticalAnalysisTopVo> ls=new ArrayList<>();
|
|
- if (StringUtils.notEmp(wpIds) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
|
|
+
|
|
- String[] wpid = wpIds.split(",");
|
|
+ if ( StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
|
|
List<String> wpids=new ArrayList<>();
|
|
List<String> wpids=new ArrayList<>();
|
|
- for(String w:wpid)
|
|
+ if(StringUtils.isNotEmpty(wpIds))
|
|
|
|
+ {
|
|
|
|
+ String[] wpid = wpIds.split(",");
|
|
|
|
+
|
|
|
|
+ for(String w:wpid)
|
|
|
|
+ {
|
|
|
|
+ wpids.add(w);
|
|
|
|
+ }
|
|
|
|
+ }else
|
|
{
|
|
{
|
|
- wpids.add(w);
|
|
+ for(Windpowerstation wp:InitialRunner.wpls)
|
|
|
|
+ {
|
|
|
|
+ if(wp.getId().endsWith("FDC"))
|
|
|
|
+ {
|
|
|
|
+ wpids.add(wp.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
ls = windturbineinfodayService.getWindturbineinfo(wpids, beginDate, endDate);
|
|
ls = windturbineinfodayService.getWindturbineinfo(wpids, beginDate, endDate);
|
|
|
|
|
|
}
|
|
}
|