值机对标、性能对标接口，接口BUG修改

src/main/java/com/gyee/frame/service/WindturbineinfodayService.java

@@ -16,6 +16,8 @@ import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -208,6 +210,8 @@ public class WindturbineinfodayService implements BaseService<WindTurbineInfoDay
 				double power=ls.stream().mapToDouble(WindTurbineInfoDay::getPower).average().getAsDouble();//平均值
 				double speed=ls.stream().mapToDouble(WindTurbineInfoDay::getSpeed).average().getAsDouble();//平均值
 				double generatingcapacity=ls.stream().mapToDouble(WindTurbineInfoDay::getGeneratingcapacity).sum();//合计
+
+				generatingcapacity = new BigDecimal(generatingcapacity).divide(new BigDecimal(10000), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).doubleValue();
 				item.setGeneratingCapacity(generatingcapacity);
 				item.setSpeed(speed);
 				item.setPower(power);

src/main/java/com/gyee/frame/service/leaderboard/LeaderboardService.java

@@ -201,13 +201,28 @@ public class LeaderboardService {
 
     public List<StatisticalAnalysisTopVo> getWindturbineinfo(String wpIds, Date beginDate, Date endDate)  {
         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<>();
-            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);
 
         }

src/test/java/test/LeaderboardTest.java

@@ -49,22 +49,21 @@ public class LeaderboardTest {
         tablepar.setOrderByColumn("power");
         tablepar.setIsAsc("asc");
 
-        AjaxResult ajaxResult =leaderboardController.fittingtoplist(tablepar,null,beginDate,endDate);
+//        AjaxResult ajaxResult =leaderboardController.fittingtoplist(tablepar,null,beginDate,endDate);
+//
+//        List<StatisticalAnalysisTopVo>   test=(List<StatisticalAnalysisTopVo>)ajaxResult.get("data");
+//        for(StatisticalAnalysisTopVo wtd:test)
+//        {
+//            System.out.println(wtd.getFrequency()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
+//        }
+
+        AjaxResult  ajaxResult =leaderboardController.totalPowerCapacityTopList(tablepar,null,beginDate,endDate);
 
-        List<StatisticalAnalysisTopVo>   test=(List<StatisticalAnalysisTopVo>)ajaxResult.get("data");
-        for(StatisticalAnalysisTopVo wtd:test)
+        List<StatisticalAnalysisTopVo>   test2=(List<StatisticalAnalysisTopVo>)ajaxResult.get("data");
+        for(StatisticalAnalysisTopVo wtd:test2)
         {
-            System.out.println(wtd.getFrequency()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
+            System.out.println(wtd.getGeneratingCapacity()+"----------------"+wtd.getPower()+"----------------"+wtd.getSpeed());
         }
-
-        ajaxResult =leaderboardController.fittingtopchart(wtid,beginDate,endDate);
-//
-//        Map<String, List> test2=(Map<String, List>)ajaxResult.get("data");
-//
-//       if(!test2.isEmpty())
-//       {
-//
-//       }
     }