新增微博图标背景色

src/main/java/com/zhiwei/searchhotcrawler/bean/IconEnum.java

@@ -8,24 +8,31 @@ package com.zhiwei.searchhotcrawler.bean;
 public enum IconEnum {
 
     /** icon图标转换 */
-    公益("jian_gongyi","益"),
-    推荐黄("recom_yellow","推荐黄"),
-    爆("boom","爆"),
-    沸("fei","沸"),
-    热("hot","热"),
-    新("new","新"),
-    推荐("jian","商"),
+    公益("jian_gongyi","益","蓝色"),
+    推荐("recom_yellow","荐","黄色"),
+    爆("boom","爆","深红色"),
+    沸("fei","沸","深橙色"),
+    热("hot","热","橙色"),
+    新("new","新","红色"),
+    商("jian","商","蓝色"),
+    首发("free_issue","首发","蓝色"),
+    预约("appointment","预约","蓝色"),
+    官宣("Officer_xuan","官宣","蓝色"),
+    上新("newest","上新","蓝色"),
 
     ;
 
-    IconEnum(String name, String describe) {
+    IconEnum(String name, String describe,String color) {
         this.name = name;
         this.describe = describe;
+        this.color = color;
     }
     /** 图标名 */
     private String name;
     /** 图标描述 */
     private String describe;
+    /** 图标背景色 */
+    private String color;
 
 
     public String getName() {
@@ -44,10 +51,19 @@ public enum IconEnum {
         this.describe = describe;
     }
 
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
     @Override
     public String toString() {
         return "IconEnum{" +
                 "name='" + name + '\'' +
                 ", describe='" + describe + '\'' +
+                ", color='" + color + '\'' +
                 '}';
     }}

src/main/java/com/zhiwei/searchhotcrawler/bean/IconName.java

@@ -12,64 +12,19 @@ public class IconName {
 
     private static Logger logger = LogManager.getLogger(IconName.class.getName());
     /**
-     * k name
-     * v describe
-     * 根据名获取
-     **/
-    static Map<String, String> nameDescribeMap;
-    /**
-     * k describe
-     * v name
-     * 根据describe获取
-     **/
-    static Map<String, String> describeNameMap;
-    /**
-     * name
-     * index
-     * 方便前端取值的内存缓存
-     **/
-    static List<Map<String, String>> describeNameMapList =  new ArrayList<>();
-
-    //为访问速度，增加冗余储存
-    static {
-
-        nameDescribeMap = Arrays.stream(IconEnum.values()).collect(Collectors.toMap(IconEnum::getName,
-                IconEnum::getDescribe, (k1, k2) -> k1));
-
-        describeNameMap = Arrays.stream(IconEnum.values()).collect(Collectors.toMap(IconEnum::getDescribe,
-                IconEnum::getName, (k1, k2) -> k1));
-    }
-
-    /**
-     * name
-     * describe
-     * 方便前端取值的内存缓存
-     **/
-    public List<Map<String, String>> getIndexNameMapList() {
-        if (describeNameMapList.isEmpty()) {
-            for (IconEnum iconEnum : IconEnum.values()) {
-                Map<String, String> map = new HashMap<>();
-                map.put("name",iconEnum.getName());
-                map.put("describe",iconEnum.getDescribe());
-                describeNameMapList.add(map);
-            }
-        }
-        return describeNameMapList;
-    }
-
-    /**
-     * 各类热搜字段对应
+     * 描述转换成描述图标名
      *
      * @param describe
      * @return
      */
-    public String describeName(String describe) {
-        if (describeNameMap.containsKey(describe)) {
-            return describeNameMap.get(describe);
-        } else {
-            logger.error("未找到相应热搜名称,describe={}", describe);
-            return null;
+    public String describeChangeName(String describe) {
+        for (IconEnum iconEnum : IconEnum.values()) {
+            if (iconEnum.getDescribe().equals(describe)){
+                return iconEnum.getName();
+            }
         }
+        logger.error("未找到相应热搜名称,describe={}", describe);
+        return null;
     }
 
     /**
@@ -78,13 +33,15 @@ public class IconName {
      * @param name
      * @return
      */
-    public String nameToDescribe(String name) {
-        if (nameDescribeMap.containsKey(name)) {
-            return nameDescribeMap.get(name);
-        } else {
-            logger.error("未找到相应热搜名称,name={}", name);
-            return null;
+    public String nameChangeDescribe(String name) {
+        for (IconEnum iconEnum : IconEnum.values()) {
+            if (iconEnum.getName().equals(name)){
+                return iconEnum.getDescribe();
+            }
         }
+        logger.error("未找到相应热搜名称,name={}", name);
+        return null;
+
     }