From fe9dfa1e206c7a927b55a67839a2293432dac92f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 4 Nov 2021 09:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E5=85=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicUserInfoServiceImpl.java     | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 16cc4b1..4d8f6da 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
@@ -11,6 +12,8 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.*;
@@ -89,6 +92,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     public VaccinationInfoDao vaccinationInfoDao;
     @Autowired
     private VimAdminFeignClient adminVimFeignClient;
+    @Autowired
+    private RedisUtils redisUtils;
 
 
     @Override
@@ -651,11 +656,15 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 PopulationDictConstant.SPECIAL_CROWD,
                 PopulationDictConstant.PEOPLE_CATEGORIES);
         sysPopulationSimpleDictFormDTO.setDicTypes(dicTypes);
-        Result<List<SysPopulationSimpleDictDTO>> listResult = adminVimFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO);
-        if (listResult == null || !listResult.success()) {
-            return new Result().error("获取字典信息失败");
+        List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS = new ArrayList<>();
+        getSysDictList(sysPopulationSimpleDictFormDTO,sysPopulationSimpleDictDTOS);
+        if(CollectionUtils.isEmpty(sysPopulationSimpleDictDTOS)){
+            Result<List<SysPopulationSimpleDictDTO>> listResult = adminVimFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO);
+            if (listResult == null || !listResult.success()) {
+                return new Result().error("获取字典信息失败");
+            }
+            sysPopulationSimpleDictDTOS = listResult.getData();
         }
-        List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS = listResult.getData();
 
         File f = StreamUtils.conversionFile(file);
         ImportParams importParams = new ImportParams();
@@ -713,6 +722,38 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result();
     }
 
+    /**
+     * 根据数据字典类型，从redis获取简版数据字典列表
+     *
+     * @param dictType 数据字典类型
+     * @return java.util.List<com.elink.esua.dto.SysSimpleDictDTO>
+     * @author yujintao
+     * @date 2019/7/15 09:42
+     */
+    public List<SysSimpleDictDTO> getSimpleDictList(String dictType) {
+        String dictKey = RedisKeys.getSimpleDictKey(dictType);
+        return (List<SysSimpleDictDTO>) redisUtils.get(dictKey);
+    }
+
+    private void getSysDictList(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO, List<SysPopulationSimpleDictDTO> listResult) {
+        for (String dictType : sysPopulationSimpleDictFormDTO.getDicTypes()) {
+            SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO = new SysPopulationSimpleDictDTO();
+
+            if (StringUtils.isNotBlank(dictType)) {
+                List<SysSimpleDictDTO> dictList = getSimpleDictList(dictType);
+                if (null != dictList) {
+                    sysPopulationSimpleDictDTO.setSysSimpleDicts(dictList);
+                    sysPopulationSimpleDictDTO.setDicType(dictType);
+                    listResult.add(sysPopulationSimpleDictDTO);
+                    continue;
+                }else{
+                    sysPopulationSimpleDictDTO = null;
+                    break;
+                }
+            }
+        }
+    }
+
 
     /**
      * @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcPopulationErrorResultDTO>