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

src/main/java/com/gyee/frame/controller/powercompare/PowerCompareController.java

@@ -362,31 +362,35 @@ public class PowerCompareController {
             for (int i=0;i<vos.size();i++)
             {
                 Windturbineinfoday3 wi=vos.get(i);
-                Map<String,Object> data=new LinkedHashMap<>();
-                data.put("yAxis",i+1);
-                data.put("xAxis",xAxis+10);
-                data.put("symbolSize",18);
-                data.put("symbol","circle");
-
-                Map<String,Object> itemStyle=new LinkedHashMap<>();
-                Map<String,Object> normal=new LinkedHashMap<>();
-                normal.put("color","#87b754");
-                itemStyle.put("normal",normal);
-                data.put("itemStyle",itemStyle);
-
-                Map<String,Object> label=new LinkedHashMap<>();
-                Map<String,Object> normal2=new LinkedHashMap<>();
-
-                normal2.put("color","#000");
-                normal2.put("position","right");
-                normal2.put("distance",12);
-                normal2.put("show",true);
-                normal2.put("formatter","风能利用率"+wi.getLyl());
-
-                label.put("normal",normal2);
-                data.put("label",label);
-
-                lylls.add(data);
+                if(!wi.getWtName().endsWith("合计"))
+                {
+                    Map<String,Object> data=new LinkedHashMap<>();
+                    data.put("yAxis",i+1);
+                    data.put("xAxis",xAxis+10);
+                    data.put("symbolSize",18);
+                    data.put("symbol","circle");
+
+                    Map<String,Object> itemStyle=new LinkedHashMap<>();
+                    Map<String,Object> normal=new LinkedHashMap<>();
+                    normal.put("color","#87b754");
+                    itemStyle.put("normal",normal);
+                    data.put("itemStyle",itemStyle);
+
+                    Map<String,Object> label=new LinkedHashMap<>();
+                    Map<String,Object> normal2=new LinkedHashMap<>();
+
+                    normal2.put("color","#000");
+                    normal2.put("position","right");
+                    normal2.put("distance",12);
+                    normal2.put("show",true);
+                    normal2.put("formatter","风能利用率"+wi.getLyl());
+
+                    label.put("normal",normal2);
+                    data.put("label",label);
+
+                    lylls.add(data);
+                }
+
             }
 
             //       System.out.println( JSONObject.toJSONString(lylls));
@@ -444,31 +448,36 @@ public class PowerCompareController {
             for (int i=0;i<vos.size();i++)
             {
                 Windpowerinfoday3 wi=vos.get(i);
-                Map<String,Object> data=new LinkedHashMap<>();
-                data.put("yAxis",i+1);
-                data.put("xAxis",xAxis+10);
-                data.put("symbolSize",18);
-                data.put("symbol","circle");
-
-                Map<String,Object> itemStyle=new LinkedHashMap<>();
-                Map<String,Object> normal=new LinkedHashMap<>();
-                normal.put("color","#87b754");
-                itemStyle.put("normal",normal);
-                data.put("itemStyle",itemStyle);
-
-                Map<String,Object> label=new LinkedHashMap<>();
-                Map<String,Object> normal2=new LinkedHashMap<>();
-
-                normal2.put("color","#000");
-                normal2.put("position","right");
-                normal2.put("distance",12);
-                normal2.put("show",true);
-                normal2.put("formatter","风能利用率"+wi.getLyl());
-
-                label.put("normal",normal2);
-                data.put("label",label);
-
-                lylls.add(data);
+
+                if(!wi.getWtName().endsWith("合计"))
+                {
+                    Map<String,Object> data=new LinkedHashMap<>();
+                    data.put("yAxis",i+1);
+                    data.put("xAxis",xAxis+10);
+                    data.put("symbolSize",18);
+                    data.put("symbol","circle");
+
+                    Map<String,Object> itemStyle=new LinkedHashMap<>();
+                    Map<String,Object> normal=new LinkedHashMap<>();
+                    normal.put("color","#87b754");
+                    itemStyle.put("normal",normal);
+                    data.put("itemStyle",itemStyle);
+
+                    Map<String,Object> label=new LinkedHashMap<>();
+                    Map<String,Object> normal2=new LinkedHashMap<>();
+
+                    normal2.put("color","#000");
+                    normal2.put("position","right");
+                    normal2.put("distance",12);
+                    normal2.put("show",true);
+                    normal2.put("formatter","风能利用率"+wi.getLyl());
+
+                    label.put("normal",normal2);
+                    data.put("label",label);
+
+                    lylls.add(data);
+                }
+
             }
 
      //       System.out.println( JSONObject.toJSONString(lylls));