知识点列表搜索

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/PointService.java

@@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName PointService
@@ -88,6 +88,21 @@ public class PointService {
     //获取科目下知识点数
     public List<TPoint> listPoints(TPoint point){
         List<TPoint> lst = pointMapper.listPoints(point);
+        String pointname = point.getPointname();
+        if (N_Utils.isNotEmpty(pointname)) {
+            List<TPoint> filterLst = lst.stream().filter(p -> p.getPointname().contains(pointname)).collect(Collectors.toList());
+            if (N_Utils.isListEmpty(filterLst)) {
+                return filterLst;
+            }
+            List<TPoint> parentPoints = new ArrayList<>();
+            for (TPoint p : filterLst) {
+                //查找所有父级知识点
+                parentPoints.addAll(getParentPoints(p, lst));
+            }
+            parentPoints.addAll(filterLst);
+            parentPoints = parentPoints.stream().distinct().collect(Collectors.toList());
+            lst = parentPoints;
+        }
 
         List<TPoint> points = new ArrayList<>();
         for (TPoint p:lst){
@@ -102,7 +117,24 @@ public class PointService {
         return points;
     }
 
-    //获取子知识点
+    //获取父级知识点
+    private List<TPoint> getParentPoints(TPoint p, List<TPoint> lst) {
+        List<TPoint> parentPoints = new ArrayList<>();
+        for (TPoint tPoint : lst) {
+            String pointpid = p.getPointpid();
+            if (N_Utils.isEmpty(pointpid)) continue;
+            if (tPoint.getPointid().equals(pointpid)) {
+                parentPoints.add(tPoint);
+                List<TPoint> parentPoints1 = getParentPoints(tPoint, lst);
+                parentPoints.addAll(parentPoints1);
+            }
+        }
+        return parentPoints;
+    }
+
+
+
+//获取子知识点
     private List<TPoint> listChildePoint(TPoint point,List<TPoint> points){
         List<TPoint> rtnPoints = new ArrayList<>();
         for(TPoint p : points){