Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/GovIssueRedisKeys.java

@@ -18,5 +18,17 @@ public class GovIssueRedisKeys {
     public static String getWorkGrassrootsIssueRedDotKey(String gridId) {
         return rootPrefix.concat(String.format("gov:wxmp:work:grassroots:issue:%s",gridId));
     }
+
+    /**
+     * 议题项目标签key         epmet:govern:customer:category:[customerId]:[categoryId]
+     *
+     * 自定义标签的categoryId统一为[customize]
+     * @param customerId
+     * @param categoryId
+     * @return
+     */
+    public static String getGovernmentTagKey(String customerId,String categoryId){
+        return rootPrefix.concat("govern:customer:category:").concat(customerId).concat(":").concat(categoryId);
+    }
 }
 

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -18,9 +18,14 @@
 package com.epmet.redis;
 
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 议题、项目标签字典表
  *
@@ -28,6 +33,7 @@ import org.springframework.stereotype.Component;
  * @since v1.0.0 2020-12-08
  */
 @Component
+@Slf4j
 public class IssueProjectTagDictRedis {
     @Autowired
     private RedisUtils redisUtils;
@@ -44,4 +50,25 @@ public class IssueProjectTagDictRedis {
         return null;
     }
 
+    /**
+     * @Description 传入category列表，返回对应category下的标签，按热度排序
+     *              category列表为空则查询客户下全部
+     *              如果想要自定义标签，单独请求一次，分类列表中只含"customize"
+     *
+     * @param customerId
+     * @param category
+     * @return java.util.List<com.epmet.dto.result.IssueCategoryTagResultDTO>
+     * @author wangc
+     * @date 2020.12.09 11:16
+    */
+    public List<IssueCategoryTagResultDTO> getTagsOrderByRank(String customerId,List<String> category){
+        if(StringUtils.isBlank(customerId)) {
+            log.error("customerId can not be null when obtain govern tags cache");
+            return null;
+        }
+
+
+        return null;
+    }
+
 }