知识库分类从字典改为读表

src/main/java/cn/breeze/elleai/application/service/AppCommonService.java

@@ -8,11 +8,14 @@ import cn.breeze.elleai.application.dto.request.ProperNounSaveDto;
 import cn.breeze.elleai.application.dto.response.AppRoleDto;
 import cn.breeze.elleai.application.dto.response.KnowledgeDataBaseCategoryDto;
 import cn.breeze.elleai.application.dto.response.ProperNounDto;
+import cn.breeze.elleai.domain.sparring.model.request.KbTagRequestModel;
 import cn.breeze.elleai.domain.sparring.model.request.ProperNounRequestModel;
 import cn.breeze.elleai.domain.sparring.model.request.ProperNounSaveModel;
 import cn.breeze.elleai.domain.sparring.model.response.DataDicResponseModel;
+import cn.breeze.elleai.domain.sparring.model.response.KbTagResponseModel;
 import cn.breeze.elleai.domain.sparring.model.response.ProperNounResponseModel;
 import cn.breeze.elleai.domain.sparring.service.CommonService;
+import cn.breeze.elleai.domain.sparring.service.KbTagService;
 import cn.breeze.elleai.util.ChineseCharacterUtil;
 import cn.breeze.elleai.util.Codes;
 import cn.breeze.elleai.util.PinYinUtils;
@@ -22,6 +25,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
 import com.mybatisflex.core.paginate.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +45,8 @@ import java.util.stream.Collectors;
 public class AppCommonService {
     
     private final CommonService commonService;
+
+    private final KbTagService kbTagService;
     
     /************************************************** 专有名词 **************************************************/
 
@@ -151,11 +157,22 @@ public class AppCommonService {
      */
     public List<KnowledgeDataBaseCategoryDto> KnowledgeDataBaseCategoryList() {
 
-        DataDicResponseModel dataDicByCode = commonService.getDataDicByCode(Codes.DATA_DIC_KDB_CATEGORY_LIST);
-        if(Objects.nonNull(dataDicByCode) && StrUtil.isNotEmpty(dataDicByCode.getDataValue())) {
-            return JSONObject.parseArray(dataDicByCode.getDataValue(), KnowledgeDataBaseCategoryDto.class);
+        List<KnowledgeDataBaseCategoryDto> result = Lists.newArrayList();
+
+        KbTagRequestModel req = new KbTagRequestModel();
+        req.setPageNo(1);
+        req.setPageSize(999);
+        req.setStatus(1);
+        List<KbTagResponseModel> tagList = kbTagService.kbTagList(req);
+        if(CollectionUtil.isNotEmpty(tagList)) {
+            result = tagList.stream().map(v -> {
+                KnowledgeDataBaseCategoryDto dto = new KnowledgeDataBaseCategoryDto();
+                dto.setId(v.getId().intValue());
+                dto.setName(v.getName());
+                return dto;
+            }).collect(Collectors.toList());
         }
-        return null;
+        return result;
     }
 
     /**