单机信息总览线路明细功率曲线接口

src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailLineChartController.java

@@ -1,5 +1,6 @@
 package com.gyee.frame.controller.goodness;
 
+import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
@@ -90,7 +91,7 @@ public class WindturbineDetailLineChartController {
         List<List<EchartDataVo>> result = windturbinegoodnessService.getplotBands(wtId, date);
 
 //
-//        System.out.println( JSONArray.toJSON(result));
+        System.out.println( JSONArray.toJSON(result));
 
         if (result != null) {
             return AjaxResult.successData(AjaxStatus.success.code, result);

src/main/java/com/gyee/frame/service/goodness/WindturbinegoodnessService.java

@@ -264,14 +264,18 @@ public class WindturbinegoodnessService {
                             vo.setxAxis(beginTime);
                             vo.setTime(time);
                             vo.setName(judgeSatte(zttemp));
-                            vo.setColor(judgeColor(zttemp));
+
+                            EchartDataVo.ItemStyle item= vo.new ItemStyle();
+                            item.setColor(judgeColor(zttemp));
+                            vo.setItemStyle(item);
+
                             vos.add(vo);
                         } else {
                             if (zt != zttemp) {
                                 zt = zttemp;
                                 c = Calendar.getInstance();
                                 c.setTime(resultDate);
-                                c.add(Calendar.MINUTE, -6);
+//                                c.add(Calendar.MINUTE, -6);
                                 endTime = sdf.format(c.getTime());
                                 time=sdf2.format(c.getTime());
                                 EchartDataVo vo = new EchartDataVo();
@@ -285,7 +289,9 @@ public class WindturbinegoodnessService {
                                     vo.setxAxis(beginTime);
                                     vo.setTime(sdf2.format(resultDate));
                                     vo.setName(judgeSatte(zttemp));
-                                    vo.setColor(judgeColor(zttemp));
+                                    EchartDataVo.ItemStyle item= vo.new ItemStyle();
+                                    item.setColor(judgeColor(zttemp));
+                                    vo.setItemStyle(item);
                                     vos.add(vo);
                                 }
                             }

src/test/java/test/GoodnessTest.java

@@ -1,17 +1,14 @@
 package test;
 
 import com.gyee.SpringbootStart;
-import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.goodness.WindturbineDetailLineChartController;
-import com.gyee.frame.model.custom.DataVo;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 public class GoodnessTest {
 
@@ -27,17 +24,17 @@ public class GoodnessTest {
         c.set(Calendar.MINUTE, 0);
         c.set(Calendar.SECOND, 0);
 
-        c.set(Calendar.DAY_OF_MONTH,2);
-        c.set(Calendar.MONTH,0);
-        c.set(Calendar.YEAR,2021);
+        c.set(Calendar.DAY_OF_MONTH, 2);
+        c.set(Calendar.MONTH, 0);
+        c.set(Calendar.YEAR, 2021);
 
         Date date = c.getTime();
 
-        String wpid="MHS_FDC";
-        String wtid="MG01_02";
+        String wpid = "MHS_FDC";
+        String wtid = "MG01_02";
 
 //        WindturbinegoodnessController windturbinegoodnessController= SpringUtils.getBean("windturbinegoodnessController");
-        WindturbineDetailLineChartController windturbineDetailLineChartController= SpringUtils.getBean("windturbineDetailLineChartController");
+        WindturbineDetailLineChartController windturbineDetailLineChartController = SpringUtils.getBean("windturbineDetailLineChartController");
 
 ////
 //
@@ -45,7 +42,7 @@ public class GoodnessTest {
 //
 //        List<Windturbineinfodaytop3> test=(List<Windturbineinfodaytop3>)ajaxResult.get("data");
 
-        Tablepar tablepar=new Tablepar();
+        Tablepar tablepar = new Tablepar();
         tablepar.setPageNum(1);
         tablepar.setPageSize(10);
 
@@ -164,15 +161,13 @@ public class GoodnessTest {
 //
 //        WindturbineDetailLineChartController windturbineDetailLineChartController= SpringUtils.getBean("windturbineDetailLineChartController");
 //
-//        AjaxResult ajaxResult =windturbineDetailLineChartController.getplotBands(wtid,"2021-01-02");
+//        AjaxResult ajaxResult = windturbineDetailLineChartController.getplotBands(wtid, "2021-01-02");
 //
-//        List<List<EchartDataVo>> test3=(List<List<EchartDataVo>>)ajaxResult.get("data");
+//        List<List<EchartDataVo>> test3 = (List<List<EchartDataVo>>) ajaxResult.get("data");
 //
-//        for(List<EchartDataVo> ls:test3)
-//        {
-//            for(EchartDataVo wtd:ls)
-//            {
-//                System.out.println(wtd.getName()+"----------------"+wtd.getxAxis());
+//        for (List<EchartDataVo> ls : test3) {
+//            for (EchartDataVo wtd : ls) {
+//                System.out.println(wtd.getName() + "----------------" + wtd.getxAxis());
 //            }
 //
 //        }
@@ -187,17 +182,17 @@ public class GoodnessTest {
 //                        +test2.get("fs")+"----------------"+test2.get("gl")+"----------------"+test2.get("sc"));
 
 
-       AjaxResult ajaxResult4 =windturbineDetailLineChartController.findWtRealPowerChar(wtid,"2021-01-01");
+//       AjaxResult ajaxResult4 =windturbineDetailLineChartController.findWtRealPowerChar(wtid,"2021-01-01");
+//
+//        List<DataVo> test4=(List<DataVo> )ajaxResult4.get("data");
+//
+//        for(DataVo wtd:test4)
+//        {
+//            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2()+"----------------"+wtd.getValue3());
+//        }
+//        System.out.println("***************************************************************************************");
+//    }
 
-        List<DataVo> test4=(List<DataVo> )ajaxResult4.get("data");
 
-        for(DataVo wtd:test4)
-        {
-            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2()+"----------------"+wtd.getValue3());
-        }
-        System.out.println("***************************************************************************************");
     }
-
-
-
 }