排行榜接口日期格式修改

src/main/java/com/gyee/frame/controller/leaderboard/LeaderboardController.java

@@ -202,10 +202,20 @@ public class LeaderboardController {
     /**查询利用率排行榜列表**/
     @GetMapping("/utilizationList")
     @ResponseBody
-    public AjaxResult utilizationList(Tablepar tablepar, String wpId, Date beginDate, Date endDate,String type) {
+    public AjaxResult utilizationList(Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
 
+        Date beginDate_d=null;
+        Date endDate_d=null;
+        if (StringUtils.isNotEmpty(beginDate))
+        {
+            beginDate_d= DateUtils.parseDate(beginDate);
+        }
+        if (StringUtils.isNotEmpty(endDate))
+        {
+            endDate_d= DateUtils.parseDate(endDate);
+        }
 
-        List<Windturbineinfoday3> vos= leaderboardService.utilizationList(tablepar, wpId, beginDate, endDate, type);
+        List<Windturbineinfoday3> vos= leaderboardService.utilizationList(tablepar, wpId, beginDate_d, endDate_d, type);
 
 
         if (vos != null && !vos.isEmpty()) {
@@ -245,10 +255,20 @@ public class LeaderboardController {
     /**查询负荷率排行榜列表**/
     @GetMapping("/loadfactortoplist")
     @ResponseBody
-    public AjaxResult loadfactortoplist(Tablepar tablepar, String wpId, Date beginDate, Date endDate) {
+    public AjaxResult loadfactortoplist(Tablepar tablepar, String wpId, String beginDate, String endDate) {
 
 
-        List<StatisticalAnalysisTopVo> vos= leaderboardService.loadfactortoplist( wpId, beginDate, endDate);
+        Date beginDate_d=null;
+        Date endDate_d=null;
+        if (StringUtils.isNotEmpty(beginDate))
+        {
+            beginDate_d= DateUtils.parseDate(beginDate);
+        }
+        if (StringUtils.isNotEmpty(endDate))
+        {
+            endDate_d= DateUtils.parseDate(endDate);
+        }
+        List<StatisticalAnalysisTopVo> vos= leaderboardService.loadfactortoplist( wpId, beginDate_d, endDate_d);
 
         if (tablepar.getOrderByColumn().equals("power")) {
             if (tablepar.getIsAsc().equals("asc")) {
@@ -315,10 +335,19 @@ public class LeaderboardController {
     /**查询报警排行榜列表**/
     @GetMapping("/querywarningStatistical")
     @ResponseBody
-    public AjaxResult querywarningStatistical(Tablepar tablepar, String type, Date beginDate, Date endDate) {
-
+    public AjaxResult querywarningStatistical(Tablepar tablepar, String type, String beginDate, String endDate) {
 
-        List<StatisticalAnalysisWarningTopVo> vos= leaderboardService.getWarningTopDate( tablepar, type, beginDate, endDate);
+        Date beginDate_d=null;
+        Date endDate_d=null;
+        if (StringUtils.isNotEmpty(beginDate))
+        {
+            beginDate_d= DateUtils.parseDate(beginDate);
+        }
+        if (StringUtils.isNotEmpty(endDate))
+        {
+            endDate_d= DateUtils.parseDate(endDate);
+        }
+        List<StatisticalAnalysisWarningTopVo> vos= leaderboardService.getWarningTopDate( tablepar, type, beginDate_d, endDate_d);
 
 
         if (vos != null && !vos.isEmpty()) {
@@ -332,10 +361,20 @@ public class LeaderboardController {
     /**查询报警排行榜图表**/
     @GetMapping("/querywarningStatisticalPie")
     @ResponseBody
-    public AjaxResult querywarningStatisticalPie(String type,  Date beginDate, Date endDate) {
+    public AjaxResult querywarningStatisticalPie(String type,  String beginDate, String endDate) {
 
-
-        List<StatisticalAnalysisWarningTopVo> vos= leaderboardService.getWarningTopDatePercentage( type, beginDate, endDate);
+        Date beginDate_d=null;
+        Date endDate_d=null;
+        if (StringUtils.isNotEmpty(beginDate))
+        {
+            beginDate_d= DateUtils.parseDate(beginDate);
+        }
+        if (StringUtils.isNotEmpty(endDate))
+        {
+            endDate_d= DateUtils.parseDate(endDate);
+        }
+        List<StatisticalAnalysisWarningTopVo> vos=
+                leaderboardService.getWarningTopDatePercentage( type, beginDate_d, endDate_d);
 
 
         if (vos != null && !vos.isEmpty()) {
@@ -349,9 +388,14 @@ public class LeaderboardController {
     /**查询日曲线偏差率列表**/
     @GetMapping("/curvefittingmainList")
     @ResponseBody
-    public AjaxResult curvefittingmainList(Tablepar tablepar, String wpId, Date recorddate) {
+    public AjaxResult curvefittingmainList(Tablepar tablepar, String wpId, String recorddate) {
+        List<Curvefittingmain> vos=new ArrayList<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+            vos= leaderboardService.curvefittingmainList( tablepar, wpId, date);
 
-        List<Curvefittingmain> vos= leaderboardService.curvefittingmainList( tablepar, wpId, recorddate);
+        }
 
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
@@ -363,9 +407,14 @@ public class LeaderboardController {
     /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
     @GetMapping("/getCurvechatAjax")
     @ResponseBody
-    public AjaxResult getCurvechatAjax(String type,String wtId,  Date recorddate) {
+    public AjaxResult getCurvechatAjax(String type,String wtId,  String recorddate) {
+        Map<String, Object> vos=new HashMap<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+            vos= leaderboardService.getCurvechatAjax( type,wtId, date);
+        }
 
-        Map<String, Object> vos= leaderboardService.getCurvechatAjax( type,wtId, recorddate);
 
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
@@ -377,9 +426,15 @@ public class LeaderboardController {
     /**查询日曲线同比图表**/
     @GetMapping("/curvechatAjaxtb")
     @ResponseBody
-    public AjaxResult curvechatAjaxtb(String type,String wtId,  Date recorddate) {
+    public AjaxResult curvechatAjaxtb(String type,String wtId,  String recorddate) {
+
+        Map<String, Object> vos=new HashMap<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+           vos= leaderboardService.curvechatAjaxtb( type,wtId, date);
+        }
 
-        Map<String, Object> vos= leaderboardService.curvechatAjaxtb( type,wtId, recorddate);
 
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
@@ -390,9 +445,14 @@ public class LeaderboardController {
     /**查询日曲线环比图表**/
     @GetMapping("/curvechatAjaxhb")
     @ResponseBody
-    public AjaxResult curvechatAjaxhb(String type,String wtId,  Date recorddate) {
+    public AjaxResult curvechatAjaxhb(String type,String wtId,  String recorddate) {
+        Map<String, Object> vos=new HashMap<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+            vos= leaderboardService.curvechatAjaxhb( type,wtId, date);
+        }
 
-        Map<String, Object> vos= leaderboardService.curvechatAjaxhb( type,wtId, recorddate);
 
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
@@ -403,9 +463,14 @@ public class LeaderboardController {
     /**查询日曲线标杆图表**/
     @GetMapping("/curvechatAjaxbg")
     @ResponseBody
-    public AjaxResult curvechatAjaxbg(String type,String wtId,  Date recorddate) {
+    public AjaxResult curvechatAjaxbg(String type,String wtId,  String recorddate) {
+        Map<String, Object> vos=new HashMap<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+            vos= leaderboardService.curvechatAjaxbg( type,wtId, date);
+        }
 
-        Map<String, Object> vos= leaderboardService.curvechatAjaxbg( type,wtId, recorddate);
 
         if (vos != null && !vos.isEmpty()) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);