From ac3a8dd59d80fbc72f090b5207353745cb0fccc8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 10 Dec 2020 16:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IssueProjectTagDictServiceImpl.java        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
index 9b40e3350b..f2acf15e3c 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -32,14 +33,14 @@ import com.epmet.dto.result.TagListResultDTO;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
 import com.epmet.service.IssueProjectTagDictService;
+import com.epmet.utils.ModuleConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 议题、项目标签字典表
@@ -117,8 +118,10 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl<IssueProject
     @Override
     public TagListResultDTO getTagList(TokenDto tokenDto, TagListFormDTO formDTO) {
         TagListResultDTO result = new TagListResultDTO();
-        List<IssueCategoryTagResultDTO> defaultList = baseDao.selectDefaultList(tokenDto.getCustomerId(), formDTO.getCategoryIdList());
-        result.setDefaulted(defaultList);
+		Map<String,List<IssueCategoryTagResultDTO>> map =  issueProjectTagDictRedis.getTagsOrderByRank(tokenDto.getCustomerId(),
+				formDTO.getCategoryIdList());
+        result.setDefaulted(map.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME));
+        result.setCustomized(map.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME).stream().limit(NumConstant.TEN).collect(Collectors.toList()));
         return result;
     }