预警模型调整

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/DataStatisticsServiceImpl.java

@@ -683,34 +683,38 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
         颜色随机 20%-30%（含）
         颜色随机 30%以上*/
          String[] tlmsList = params.getTlms().split(",");
-         String[] tlysList = params.getTlys().split(",");
+         String[] tlysList = params.getTlys().split("\\),");
+         Map mapColour = new HashMap();
         for (int i = 0; i <tlmsList.length; i++) {
             String ms = tlmsList[i];
-            String ys =tlysList[i];
-
+            String ys = tlysList[i];
+            if (!ys.endsWith(")")) {
+                ys = ys + ")";
+            }
+            mapColour.put(ms, ys);
+        }
             for(Map maps:list) {
                 String status = maps.get("amplitudeFlag").toString();
                 float bfs = Float.valueOf(String.valueOf(maps.get("bfs")).replace("%","").replaceAll(",",""));
                 if(status.equals("increase")||status.equals("centre")){ // 增长
-                    if( ms.equals("10%（含）")  && bfs<=10){
-                        maps.put("tlms",ms);
-                        maps.put("colour",ys);
-                    }else if( ms.equals("10%-20%（含）") && bfs>10&&bfs<=20){
-                        maps.put("tlms",ms);
-                        maps.put("colour",ys);
-                    }else if( ms.equals("20%-30%（含）") && bfs>20&&bfs<=30){
-                        maps.put("tlms",ms);
-                        maps.put("colour",ys);
-                    }else if( ms.equals("30%以上") && bfs>30){
-                        maps.put("tlms",ms);
-                        maps.put("colour",ys);
+                    if(bfs<=10){
+                        maps.put("tlms","10%（含）");
+                        maps.put("colour",mapColour.get("10%（含）"));
+                    }else if( bfs>10&&bfs<=20){
+                        maps.put("tlms","10%-20%（含）");
+                        maps.put("colour",mapColour.get("10%-20%（含）"));
+                    }else if(bfs>20&&bfs<=30){
+                        maps.put("tlms","20%-30%（含）");
+                        maps.put("colour",mapColour.get("20%-30%（含）"));
+                    }else if(bfs>30){
+                        maps.put("tlms","30%以上");
+                        maps.put("colour",mapColour.get("30%以上"));
                     }
-                }else if( ms.equals("下降或持平") && (status.equals("decreasing") || status.equals("equal"))){ // 降低  持平
-                    maps.put("tlms",ms);
-                    maps.put("colour",ys);
+                }else if(status.equals("decreasing") || status.equals("equal")){ // 降低  持平
+                    maps.put("tlms","下降或持平");
+                    maps.put("colour",mapColour.get("下降或持平"));
                 }
             }
-        }
         return list;
     }
     // 重庆不参与排序