Browse Source

横向对标日期格式修改

shilin 4 years ago
parent
commit
abc4f829a2

+ 3 - 2
src/main/java/com/gyee/frame/controller/compare/CompareController.java

@@ -2,6 +2,7 @@ package com.gyee.frame.controller.compare;
 
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.service.compare.CompareService;
+import com.gyee.frame.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,10 +20,10 @@ public class CompareController {
     /**查询日横向对比列表**/
     @GetMapping("/compareDayList")
     @ResponseBody
-    public AjaxResult compareDayList(String windturbineid,Date date) {
+    public AjaxResult compareDayList(String windturbineid,String date) {
 
 
-        AjaxResult ajaxResult=compareService.compareDayList(windturbineid,date) ;
+        AjaxResult ajaxResult=compareService.compareDayList(windturbineid, DateUtils.parseStrtoDate(date)) ;
 
         return ajaxResult;
 

+ 23 - 26
src/test/java/test/CompareTest.java

@@ -4,17 +4,14 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.compare.CompareController;
-import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.GoodCompareVo;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.model.custom.ValueVo;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 public class CompareTest {
 
@@ -48,7 +45,7 @@ public class CompareTest {
         tablepar.setPageNum(1);
         tablepar.setPageSize(10);
 
-        AjaxResult ajaxResult =compareController.compareDayList(wtid,date);
+        AjaxResult ajaxResult =compareController.compareDayList(wtid,"2021-01-02");
 
         List<GoodCompareVo> test=(List<GoodCompareVo>)ajaxResult.get("data");
         for(GoodCompareVo wtd:test)
@@ -56,28 +53,28 @@ public class CompareTest {
             System.out.println(wtd.getName()+"----------------"+wtd.getValue1()+"----------------"+wtd.getValue2());
         }
 
-        ajaxResult =compareController.fzyDay(wtid,date);
-
-        Map<String, Object> test2=(Map<String, Object>)ajaxResult.get("data");
-        System.out.println(String.valueOf(test2.get("jfpl")));
-        List<ValueVo> vos =(List<ValueVo>)test2.get("data");
-
-        for(ValueVo wtd:vos)
-        {
-            System.out.println(wtd.getName()+"----------------"+wtd.getValue()+"----------------"+wtd.getData1());
-        }
-        System.out.println("***************************************************************************************");
-
-        ajaxResult =compareController.compareDayChat(wtid,date);
-
-        List<DataVo> test3=(List<DataVo>)ajaxResult.get("data");
-
-        for(DataVo wtd:test3)
-        {
-            System.out.println(wtd.getValue1()+"----------------"+wtd.getSpeed());
-        }
-        System.out.println("***************************************************************************************");
-
+//        ajaxResult =compareController.fzyDay(wtid,date);
+//
+//        Map<String, Object> test2=(Map<String, Object>)ajaxResult.get("data");
+//        System.out.println(String.valueOf(test2.get("jfpl")));
+//        List<ValueVo> vos =(List<ValueVo>)test2.get("data");
+//
+//        for(ValueVo wtd:vos)
+//        {
+//            System.out.println(wtd.getName()+"----------------"+wtd.getValue()+"----------------"+wtd.getData1());
+//        }
+//        System.out.println("***************************************************************************************");
+//
+//        ajaxResult =compareController.compareDayChat(wtid,date);
+//
+//        List<DataVo> test3=(List<DataVo>)ajaxResult.get("data");
+//
+//        for(DataVo wtd:test3)
+//        {
+//            System.out.println(wtd.getValue1()+"----------------"+wtd.getSpeed());
+//        }
+//        System.out.println("***************************************************************************************");
+//
 
     }