浏览代码

更新查询所有术语接口

MarkHuang 6 年之前
父节点
当前提交
de50165ff4

+ 1 - 1
knowledge-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "term" }); // 需要生成的表
+        strategy.setInclude(new String[] { "lexicon_relationship" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

+ 10 - 17
knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.api.ImportExcel;
 import com.diagbot.dto.ConceptDTO;
 import com.diagbot.entity.*;
@@ -99,28 +100,20 @@ public class ConceptFacade extends ConceptServiceImpl {
     public List<ConceptDTO> getAllConcept() {
         List<ConceptDTO> conceptDTOS = new ArrayList<>();
         ConceptDTO conceptDTO;
-        LibraryInfo libraryInfo;
 
-        List<Concept> concepts = this.list();
+        QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
+        query.eq("is_concept", 1);
+        List<LibraryInfo> libraryInfos = libraryinfoFacade.list(query);
 
-        for (Concept concept : concepts) {
+        for (LibraryInfo libraryInfo : libraryInfos) {
             conceptDTO = new ConceptDTO();
 
-            conceptDTO.setId(concept.getId());
-            conceptDTO.setLibId(concept.getLibId());
-
-            Map<String, Object> params = new HashMap<>();
-            params.put("id", concept.getLibId());
-            params.put("concept_id", concept.getId());
-            params.put("is_concept", 1);
-            libraryInfo = libraryinfoFacade.getLibraryInfor(params);
-
-            if (libraryInfo != null) {
-                conceptDTO.setName(libraryInfo.getName());
-                conceptDTO.setLibraryInfo(libraryInfo);
+            conceptDTO.setId(libraryInfo.getConceptId());
+            conceptDTO.setLibId(libraryInfo.getId().intValue());
+            conceptDTO.setName(libraryInfo.getName());
+            conceptDTO.setLibraryInfo(libraryInfo);
 
-                conceptDTOS.add(conceptDTO);
-            }
+            conceptDTOS.add(conceptDTO);
         }
 
         return conceptDTOS;