简历解析结构修改和字典逻辑修改

vetti-system/src/main/java/com/vetti/system/service/impl/SysDictTypeServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
+
+import cn.hutool.core.collection.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -73,20 +75,46 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public List<SysDictData> selectDictDataByType(String dictType)
     {
-        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
+//        List<SysDictData> dictDataTops = DictUtils.getDictCache(dictType);
+//        if (StringUtils.isNotEmpty(dictDataTops))
+//        {
+//            return dictDataTops;
+//        }
+        List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
         if (StringUtils.isNotEmpty(dictDatas))
         {
-            return dictDatas;
-        }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
-            DictUtils.setDictCache(dictType, dictDatas);
-            return dictDatas;
+            //先查询父类字典数据
+            List<SysDictData> dictParentDatas = dictDatas.stream().filter(e->e.getDictParentCode().longValue() == -1L).toList();
+            if(CollectionUtil.isNotEmpty(dictParentDatas)){
+                //递归查询子集
+                for(SysDictData dictData : dictParentDatas){
+                    //查询对应的子级数据
+                    getChildrenDictData(dictDatas,dictData);
+                }
+            }
+//            DictUtils.setDictCache(dictType, dictParentDatas);
+            return dictParentDatas;
         }
         return null;
     }
 
+    /**
+     * 查询子级字典数据
+     * @param dictDatas
+     * @param dictParentData
+     */
+    private void getChildrenDictData(List<SysDictData> dictDatas,SysDictData dictParentData){
+        List<SysDictData> dictChildrenDatas = dictDatas.stream().
+                filter(e->e.getDictParentCode().longValue() == dictParentData.getDictCode().longValue()).toList();
+        if(CollectionUtil.isNotEmpty(dictChildrenDatas)){
+            for(SysDictData dictChildData : dictChildrenDatas){
+                getChildrenDictData(dictDatas,dictChildData);
+            }
+            dictParentData.setChildrenDictData(dictChildrenDatas);
+        }
+    }
+
+
     /**
      * 根据字典类型ID查询信息
      *