静态信息搜索优化

aipt-service/src/main/java/com/diagbot/service/impl/ConceptServiceImpl.java

@@ -10,11 +10,13 @@ import com.diagbot.entity.Concept;
 import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.mapper.ConceptMapper;
 import com.diagbot.service.ConceptService;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.RetrievalVO;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -58,7 +60,18 @@ public class ConceptServiceImpl extends ServiceImpl<ConceptMapper, Concept> impl
      */
     @Override
     public List<RetrievalDTO> staticKnowledge(RetrievalVO retrievalVO){
-        return baseMapper.staticKnowledge(retrievalVO);
+        List<RetrievalDTO> staticList = baseMapper.staticKnowledge(retrievalVO);
+        List<RetrievalDTO> res = new ArrayList<>();
+        if (ListUtil.isNotEmpty(staticList)){
+            List<Long> ids = new ArrayList<>();
+            for (RetrievalDTO retrievalDTO : staticList){
+                if (!ids.contains(retrievalDTO.getConceptId())){
+                    ids.add(retrievalDTO.getConceptId());
+                    res.add(retrievalDTO);
+                }
+            }
+        }
+        return res;
     }
 
     /**

aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -693,7 +693,7 @@
                             b2.id conceptId,
                             b1.parentName `name`,
                             34 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 10 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -706,7 +706,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t5.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -746,7 +746,7 @@
                             b2.id conceptId,
                             b1.parentName `name`,
                             35 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 10 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -759,7 +759,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t5.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -799,7 +799,7 @@
                             b2.id conceptId,
                             b1.parentName `name`,
                             36 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 10 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -812,7 +812,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t5.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -859,7 +859,7 @@
                                 ')'
                             ) `name`,
                             41 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -872,7 +872,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t1.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -921,7 +921,7 @@
                                 ')'
                             ) `name`,
                             42 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -934,7 +934,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t1.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -983,7 +983,7 @@
                                 ')'
                             ) `name`,
                             43 AS orderNo,
-                            b1.selfName retrievalName,
+                            b1.retrievalName retrievalName,
                             b1.showType + 20 showType,
                             b1.libTypeId libTypeId,
                             b1.libTypeName libTypeName,
@@ -996,7 +996,7 @@
                                     t1.lib_name selfName,
                                     t5.id parentId,
                                     t5.lib_name parentName,
-                                    NULL sameName,
+                                    t2.`name` retrievalName,
                                     t2.is_concept showType,
                                     t1.lib_type libTypeId,
                                     t6.`name` libTypeName
@@ -1035,8 +1035,6 @@
                         AND b2.id = b3.concept_id
                     )
             ) a1
-        GROUP BY
-            a1.conceptId
         ORDER BY
             a1.orderNo ASC,
             a1.showType DESC