fixed:语言取前20;性质-字典翻译

src/main/java/com/zzsn/thinktank/constants/CommonConstants.java

+package com.zzsn.thinktank.constants;
+
+public class CommonConstants {
+    /**
+     * 智库性质字典key
+     */
+    public static final String DIC_THINK_TANK_NATURE = "think_tank_nature";
+}

src/main/java/com/zzsn/thinktank/service/ISysDictItemService.java

@@ -15,4 +15,10 @@ import java.util.List;
  * @since 2018-12-28
  */
 public interface ISysDictItemService extends IService<SysDictItem> {
+    /**
+     * 根据字典code查询字典项数据
+     * @param itemCode 字典code
+     * @return 字典项数据
+     */
+    List<SysDictItem> selectByItemCode(String itemCode);
 }

src/main/java/com/zzsn/thinktank/service/impl/SysDictItemServiceImpl.java

 package com.zzsn.thinktank.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.zzsn.thinktank.entity.SysDict;
 import com.zzsn.thinktank.entity.SysDictItem;
 import com.zzsn.thinktank.mapper.SysDictItemMapper;
 import com.zzsn.thinktank.service.ISysDictItemService;
+import com.zzsn.thinktank.service.ISysDictService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -23,5 +29,19 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
 
     @Autowired
     private SysDictItemMapper sysDictItemMapper;
+    @Autowired
+    private ISysDictService sysDictService;
 
+    @Override
+    public List<SysDictItem> selectByItemCode(String itemCode) {
+        if (StringUtils.isEmpty(itemCode)) {
+            return Lists.newArrayList();
+        }
+        List<SysDict> dictLst = sysDictService.list(Wrappers.lambdaQuery(SysDict.class).eq(SysDict::getDictCode, itemCode));
+        if (CollectionUtils.isEmpty(dictLst)) {
+            return Lists.newArrayList();
+        }
+        String dictId = dictLst.get(0).getId();
+        return list(Wrappers.lambdaQuery(SysDictItem.class).eq(SysDictItem::getDictId, dictId));
+    }
 }

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

 package com.zzsn.thinktank.service.impl;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.thinktank.constants.CommonConstants;
 import com.zzsn.thinktank.entity.*;
 import com.zzsn.thinktank.mapper.ThinktankBasicInfoMapper;
 import com.zzsn.thinktank.mapper.ThinktankOttInfoMapper;
@@ -808,9 +810,20 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
                 break;
             case "lang":
                 mapList = processGroupingByLang(list, ThinktankBasicInfo::getLang, true,",");//语言
+                // 取排名前20
+                mapList.sort((m1, m2) -> MapUtil.getInt(m2, "num") - MapUtil.getInt(m1, "num"));
+                mapList = mapList.stream().limit(20).collect(Collectors.toList());
                 break;
             case "nature":
                 mapList = processGrouping(list, ThinktankBasicInfo::getNature, false,null);//性质
+                List<SysDictItem> dictItemList = sysDictItemService.selectByItemCode(CommonConstants.DIC_THINK_TANK_NATURE);
+                Map<String, String> dictMap = dictItemList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText));
+                mapList.forEach(map -> {
+                    String dictKey = MapUtil.getStr(map, "data");
+                    if (MapUtil.isNotEmpty(dictMap) && dictMap.containsKey(dictKey)) {
+                        map.put("data", dictMap.get(dictKey));
+                    }
+                });
                 break;
             case "influencePosition":
                 mapList = processGrouping(list, ThinktankBasicInfo::getInfluencePosition, true,"、");//影响力和地位