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

src/main/java/com/gyee/frame/model/custom/EchartDataVo.java

@@ -12,8 +12,8 @@ public class EchartDataVo {
 
     private ItemStyle itemStyle;
 
-    private String time;
-
+    private String time1;
+    private String time2;
 
     public String getName() {
         return name;
@@ -31,12 +31,20 @@ public class EchartDataVo {
         this.xAxis = xAxis;
     }
 
-    public String getTime() {
-        return time;
+    public String getTime1() {
+        return time1;
+    }
+
+    public void setTime1(String time1) {
+        this.time1 = time1;
+    }
+
+    public String getTime2() {
+        return time2;
     }
 
-    public void setTime(String time) {
-        this.time = time;
+    public void setTime2(String time2) {
+        this.time2 = time2;
     }
 
     public ItemStyle getItemStyle() {

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

@@ -262,7 +262,7 @@ public class WindturbinegoodnessService {
                             zt = zttemp;
                             EchartDataVo vo = new EchartDataVo();
                             vo.setxAxis(beginTime);
-                            vo.setTime(time);
+                            vo.setTime1(time);
                             vo.setName(judgeSatte(zttemp));
 
                             EchartDataVo.ItemStyle item= vo.new ItemStyle();
@@ -280,14 +280,14 @@ public class WindturbinegoodnessService {
                                 time=sdf2.format(c.getTime());
                                 EchartDataVo vo = new EchartDataVo();
                                 vo.setxAxis(endTime);
-                                vo.setTime(time);
+                                vo.setTime2(time);
                                 vos.add(vo);
                                 if (vos.size() == 2) {
                                     resultvos.add(vos);
                                     vos = new ArrayList<>();
                                     vo = new EchartDataVo();
                                     vo.setxAxis(beginTime);
-                                    vo.setTime(sdf2.format(resultDate));
+                                    vo.setTime1(sdf2.format(resultDate));
                                     vo.setName(judgeSatte(zttemp));
                                     EchartDataVo.ItemStyle item= vo.new ItemStyle();
                                     item.setColor(judgeColor(zttemp));
@@ -341,25 +341,25 @@ public class WindturbinegoodnessService {
         String ztname=null;
         switch ( zt ) {
             case 0:
-                ztname= "#34A90A";
+                ztname= "#BFFFDF";
                 break;
             case 1:
-                ztname= "#08FCF0";
+                ztname= "#E7FFFF";
                 break;
             case 2:
-                ztname= "#FD0100";
+                ztname= "#FFBFBF";
                 break;
             case 3:
-                ztname= "#A6A6A6";
+                ztname= "#DDDDDD";
                 break;
             case 4:
-                ztname= "#FD7D1C";
+                ztname= "#FFDFBF";
                 break;
             case 5:
-                ztname= "#D201D8";
+                ztname= "#FFDFFF";
                 break;
             case 6:
-                ztname= "#D201D8";
+                ztname= "#FFDFFF";
                 break;
             default: