风玫瑰图

cpp-admin/src/main/java/com/cpp/web/controller/stationDataQuery/WindTowerStatusDataController.java

@@ -168,15 +168,15 @@ public class WindTowerStatusDataController {
      * @return
      */
     private List geWsWdWfData(List<WindTowerStatusData> windTowerStatusDataList) {
-        Map<WsIntervalEnum, List<WindTowerStatusData>> wsIntervalEnumListMap = windTowerStatusDataList.stream().collect(Collectors.groupingBy(w -> WsIntervalEnum.getWsInterval(w.getWdHubHeight().doubleValue())));
-        List<Map<String,Object>> list = new ArrayList<>();
+        Map<WsIntervalEnum, List<WindTowerStatusData>> wsIntervalEnumListMap = windTowerStatusDataList.stream().collect(Collectors.groupingBy(w -> WsIntervalEnum.getWsInterval(w.getWsHubHeight().doubleValue())));
+        List<Map<String, Object>> list = new ArrayList<>();
 
         for (WsIntervalEnum value : WsIntervalEnum.values()) {
-            Map<String,Object> map = new HashMap<>();
-            Map<String,Object> eumForMap = new HashMap<>();
-            eumForMap.put("explain",value.getExplain());
-            eumForMap.put("color",value.getColor());
-            map.put("key",eumForMap);
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> eumForMap = new HashMap<>();
+            eumForMap.put("explain", value.getExplain());
+            eumForMap.put("color", value.getColor());
+            map.put("key", eumForMap);
             if (wsIntervalEnumListMap.containsKey(value)) {
                 map.put("value", getCalcWd(wsIntervalEnumListMap.get(value), Double.valueOf(windTowerStatusDataList.size())));
             } else {
@@ -256,13 +256,13 @@ public class WindTowerStatusDataController {
     @Getter
     @AllArgsConstructor
     enum WsIntervalEnum {
-        I1("<0.5m/s", 0D, 0.4D, 0,"rgb(255,0,47)"),
-        I2("0.5~2m/s", 0.5D, 1.9D, 1,"rgba(16,217,16,0.96)"),
-        I3("2~4m/s", 2D, 3.9D, 2,"rgba(15,246,15,0.96)"),
-        I4("4~6m/s", 4D, 5.9D, 3,"rgb(239,248,10)"),
-        I5("6~8m/s", 6D, 7.9D, 4,"rgb(244,245,244)"),
-        I6("8~10m/s", 8D, 9.9D, 5,"rgb(98,206,111)"),
-        I7(">10m/s", 10D, 100D, 5,"rgb(232,236,124)"),
+        I1("<0.5m/s", 0D, 0.4D, 0, "rgb(255,0,47)"),
+        I2("0.5~2m/s", 0.5D, 1.9D, 1, "rgba(16,217,16,0.96)"),
+        I3("2~4m/s", 2D, 3.9D, 2, "rgba(15,246,15,0.96)"),
+        I4("4~6m/s", 4D, 5.9D, 3, "rgb(239,248,10)"),
+        I5("6~8m/s", 6D, 7.9D, 4, "rgb(244,245,244)"),
+        I6("8~10m/s", 8D, 9.9D, 5, "rgb(98,206,111)"),
+        I7(">10m/s", 10D, 100D, 5, "rgb(232,236,124)"),
         ;
         private String explain;
         private Double min;
@@ -273,10 +273,11 @@ public class WindTowerStatusDataController {
         public static WsIntervalEnum getWsInterval(Double ws) {
             return (ws >= I2.min && ws <= I2.max) ? I2 :
                     (ws >= I3.min && ws <= I3.max) ? I3 :
-                            (ws >= I5.min && ws <= I5.max) ? I5 :
-                                    (ws >= I6.min && ws <= I6.max) ? I6 :
-                                            (ws >= I7.min && ws <= I7.max) ? I7 :
-                                                    I1;
+                            (ws >= I4.min && ws <= I4.max) ? I4 :
+                                    (ws >= I5.min && ws <= I5.max) ? I5 :
+                                            (ws >= I6.min && ws <= I6.max) ? I6 :
+                                                    (ws >= I7.min && ws <= I7.max) ? I7 :
+                                                            I1;
         }