知识点本身、分段、分组分析

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportsubject/MsrSubjectPointMapper.java

@@ -2,6 +2,10 @@ package com.xhkjedu.smarking.mapper.report.reportsubject;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectPoint;
+import com.xhkjedu.smarking.vo.report.reportsubject.PointVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷报告-学科知识点表 Mapper 接口
@@ -9,4 +13,7 @@ import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectPoint;
  * @Date 2024-12-09
  */
 public interface MsrSubjectPointMapper extends TkMapper<MsrSubjectPoint> {
+
+    //科目知识点
+    List<PointVo> listSubjectPoints(@Param("subjectid") String subjectid, @Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGeneratePointService.java

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.service.report.generate;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.paper.MsPaperAnalyzeMapper;
+import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.paper.MsPaperAnalyze;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
@@ -16,14 +17,14 @@ import com.xhkjedu.smarking.vo.paper.QuestionPointVo;
 import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
 import com.xhkjedu.smarking.vo.report.reportstu.PointQuestionVo;
 import com.xhkjedu.smarking.vo.report.reportstu.PointStudentVo;
+import com.xhkjedu.smarking.vo.report.reportsubject.PointLevelVo;
+import com.xhkjedu.smarking.vo.report.reportsubject.PointVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -35,6 +36,8 @@ import java.util.stream.Collectors;
 public class ReportGeneratePointService {
     @Resource
     private MsPaperAnalyzeMapper msPaperAnalyzeMapper;
+    @Resource
+    private MsrSubjectPointMapper msrSubjectPointMapper;
 
     //知识点分析，题库知识点按母题分析
     public void generatePoint(List<MsPaperStudentQuestion> stuSubjectQuestions, List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,
@@ -153,7 +156,9 @@ public class ReportGeneratePointService {
             List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, pqvo, 3);
             savePointSections.addAll(pointSecs);
 
-            //知识点机构考生分组分析
+            //知识点考生分组分析
+            List<MsrSubjectPointRankgroup> pointRankg = pointRankGroup(pointStuScores,sturanks, pqvo, examid, subjectid, 3);
+            savePointRankgroups.addAll(pointRankg);
 
             double schoolSumScore = pointStuScores.stream().mapToDouble(PointStudentVo::getStuscore).sum();
             int stunum = pointStuScores.size();
@@ -178,7 +183,6 @@ public class ReportGeneratePointService {
                 saveStuPoints.add(stuPoint);
             }
         }
-
     }
 
     // 知识点:设置每个学生每个试题知识点得分
@@ -289,7 +293,7 @@ public class ReportGeneratePointService {
     }
 
     //知识点-考试排名分组分析
-    private List<MsrSubjectPointRankgroup> questionScoreRankGroup(List<PointStudentVo> pointStuScores, List<MsrStudent> stuPapers, PointQuestionVo pqvo,Integer examid,String subjectid, Integer pointlevel){
+    private List<MsrSubjectPointRankgroup> pointRankGroup(List<PointStudentVo> pointStuScores, List<MsrStudent> stuPapers, PointQuestionVo pqvo,Integer examid,String subjectid, Integer pointlevel){
         //获取学生排名最大名次的树
         Integer totalRank = stuPapers.stream().mapToInt(MsrStudent::getSchoolrank).max().orElse(0);
         //获取排名分组,默认分为7组
@@ -343,8 +347,6 @@ public class ReportGeneratePointService {
                     }else{
                         sectionStuQuestions = groupStuPoints.stream().filter(q -> q.getStuscore() >= sectionScore.getMinvalue() && q.getStuscore() < sectionScore.getMaxvalue()).collect(Collectors.toList());
                     }
-                    // double sectionStuSumScore = sectionStuQuestions.stream().mapToDouble(PointStudentVo::getStuscore).sum();
-                    // double sectionStuAvgScore = MarkingUtil.div(sectionStuSumScore, sectionStuQuestions.size());
                     sqrg.setStunum(sectionStuQuestions.size());
                     sqrg.setStuids(sectionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
                 }else{
@@ -358,4 +360,194 @@ public class ReportGeneratePointService {
         }
         return rtnList;
     }
+
+    //获取处理知识点对应的顶层、上层知识点
+    private Map<String,Map<String,List<PointLevelVo>>> listSubjectPoints(String subjectid,Integer examid,List<PointQuestionVo> pointques){
+        //获取所有知识点
+        List<PointVo> points = msrSubjectPointMapper.listSubjectPoints(subjectid,examid);
+        Map<String,PointVo> pointMap = points.stream().collect(Collectors.toMap(PointVo::getPointid, Function.identity()));
+
+        List<PointLevelVo> upPoints = new ArrayList<>();//知识点的上层(二级)知识点
+        List<PointLevelVo> topPoints = new ArrayList<>();//知识点的顶层层(一级)知识点
+        for(PointQuestionVo point : pointques){
+            PointLevelVo upPoint = new PointLevelVo();
+            upPoint.setPointid(point.getPointid());
+            upPoint.setPointname(point.getPointname());
+
+            PointLevelVo topPoint = new PointLevelVo();
+            topPoint.setPointid(point.getPointid());
+            topPoint.setPointname(point.getPointname());
+
+            //获取知识点的详细信息
+            if(pointMap.containsKey(point.getPointid())){
+                PointVo pointVo = pointMap.get(point.getPointid());
+                PointVo parentNode =pointVo.getParent(points);//上层知识点
+                upPoint.setTopPointid(parentNode.getPointid());
+                upPoint.setTopPointname(parentNode.getPointname());
+
+                //找到顶层知识点
+                PointVo rootNode = getRootNode(parentNode, points);
+                if(rootNode!= null){
+                    topPoint.setTopPointid(rootNode.getPointid());
+                    topPoint.setTopPointname(rootNode.getPointname());
+                }else{
+                    topPoint.setTopPointid(point.getPointid());
+                    topPoint.setTopPointname(point.getPointname());
+                }
+            }else{
+                upPoint.setTopPointid(point.getPointid());
+                upPoint.setTopPointname(point.getPointname());
+
+                topPoint.setTopPointid(point.getPointid());
+                topPoint.setTopPointname(point.getPointname());
+            }
+
+            upPoints.add(upPoint);
+            topPoints.add(topPoint);
+        }
+
+        Map<String,List<PointLevelVo>> upMap = upPoints.stream().collect(Collectors.groupingBy(PointLevelVo::getTopPointid));
+        Map<String,List<PointLevelVo>> topMap = topPoints.stream().collect(Collectors.groupingBy(PointLevelVo::getTopPointid));
+        Map<String,Map<String,List<PointLevelVo>>> rtnMap = new HashMap<>();
+        rtnMap.put("up",upMap);
+        rtnMap.put("top",topMap);
+        return rtnMap;
+    }
+    //获取顶层节点
+    private PointVo getRootNode(PointVo targetNode, List<PointVo> allNodes) {
+        PointVo current = targetNode;
+        while (N_Utils.isNotEmpty(current.getPointpid())) {
+            current = current.getParent(allNodes);
+        }
+        return current;
+    }
+
+    //处理顶级、上级知识点
+    private void handlePointLevel(Map<String,List<PointLevelVo>> pointMap,List<PointQuestionVo> pointques,List<PointStudentVo> schoolStuPoints,Integer pointlevel,List<MsrSubjectPointSection> pointSections,
+                                    List<MsPaperQtypeQuestion> qtypeQuestions,List<MsClassStudent> classStus,Integer examid,String subjectid,List<MsrStudent> sturanks,
+                                    List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections,List<MsrSubjectPointRankgroup> savePointRankgroups){
+
+        //科目班级知识点情况
+        Map<String, List<MsrSubjectPoint>> subjectPointMap = saveSubjectPoints.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPoint::getPointid));
+        //知识点学科总分区间
+        Map<String, List<MsrSubjectPointSection>> pointSectionMap = savePointSections.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPointSection::getPointid));
+        //知识点分组
+        Map<String, List<MsrSubjectPointRankgroup>> pointRankgroupMap = savePointRankgroups.stream().filter(p -> p.getPointlevel()==3).collect(Collectors.groupingBy(MsrSubjectPointRankgroup::getPointid));
+
+        //处理上层知识点
+        for(Map.Entry<String,List<PointLevelVo>> entry : pointMap.entrySet()){
+            List<PointLevelVo> pointLevels = entry.getValue();
+            PointLevelVo firstPoint = pointLevels.get(0);
+            if(pointLevels.size() ==1){
+                //说明知识的上层知识点是知识点本身或者仅有一个知识点，则上层知识点分析和他本身的分析一致
+                //科目知识点
+                List<MsrSubjectPoint> subpoints = subjectPointMap.get(firstPoint.getPointid());
+                for(MsrSubjectPoint subpoint : subpoints){
+                    subpoint.setPointid(firstPoint.getTopPointid());
+                    subpoint.setPointname(firstPoint.getPointname());
+                    subpoint.setPointlevel(pointlevel);
+                    saveSubjectPoints.add(subpoint);
+                }
+
+                //分数分段
+                List<MsrSubjectPointSection> sepoints = pointSectionMap.get(firstPoint.getPointid());
+                for(MsrSubjectPointSection sepoint : sepoints) {
+                    sepoint.setPointid(firstPoint.getTopPointid());
+                    sepoint.setPointname(firstPoint.getPointname());
+                    sepoint.setPointlevel(pointlevel);
+                    savePointSections.add(sepoint);
+                }
+
+                //分组分析
+                List<MsrSubjectPointRankgroup> rgpoints = pointRankgroupMap.get(firstPoint.getPointid());
+                for(MsrSubjectPointRankgroup rgpoint : rgpoints) {
+                    rgpoint.setPointid(firstPoint.getTopPointid());
+                    rgpoint.setPointname(firstPoint.getPointname());
+                    rgpoint.setPointlevel(pointlevel);
+                    savePointRankgroups.add(rgpoint);
+                }
+            }else{
+                //上层知识点所包含的知识点id集合
+                List<String> pointids = pointLevels.stream().map(PointLevelVo::getPointid).collect(Collectors.toList());
+                //知识点下试题，以及学生得分
+                List<PointQuestionVo> levelPointQues = pointques.stream().filter(q -> pointids.contains(q.getPointid())).collect(Collectors.toList());
+                List<PointStudentVo> levelStuPoints = schoolStuPoints.stream().filter(q -> pointids.contains(q.getPointid())).collect(Collectors.toList());
+                List<QuestionPointVo> ques = new ArrayList<>();//知识点下所有试题
+                for(PointQuestionVo point : levelPointQues) {
+                    ques.addAll(point.getQues());
+                }
+
+                List<Integer> mptqids = ques.stream().map(QuestionPointVo::getMptqid).distinct().collect(Collectors.toList());
+                //获取试题对应的qn
+                List<MsPaperQtypeQuestion> qtypeQues =  qtypeQuestions.stream().filter(q -> mptqids.contains(q.getMptqid())).collect(Collectors.toList());
+                String qnStr = qtypeQues.stream().map(q -> q.getMptqn()  + "." + q.getQn()).collect(Collectors.joining(","));
+                String mptqidStr = mptqids.stream().map(Object::toString).collect(Collectors.joining(","));
+                double pointscore = levelPointQues.stream().mapToDouble(PointQuestionVo::getScore).sum();
+                pointscore = N_Utils.formatDouble(pointscore, 1);
+                //知识点多个试题，处理成单个学生试题总分值
+                List<PointStudentVo> pointStuScores = new ArrayList<>();//处理成学生知识点形式，后续计算使用
+                Map<Integer, List<PointStudentVo>> pointStuMap = levelStuPoints.stream().collect(Collectors.groupingBy(PointStudentVo::getStudentid));
+                for (Map.Entry<Integer, List<PointStudentVo>> psentry : pointStuMap.entrySet()){
+                    List<PointStudentVo> pstuScores = psentry.getValue();
+                    double stuScore = pstuScores.stream().mapToDouble(PointStudentVo::getStuscore).sum();
+                    stuScore = N_Utils.formatDouble(stuScore, 1);
+                    PointStudentVo pstuvo = new PointStudentVo();
+                    pstuvo.setStudentid(psentry.getKey());
+                    pstuvo.setPointid(entry.getKey());
+                    pstuvo.setStuscore(stuScore);
+                    pstuvo.setScore(pointscore);
+                    pointStuScores.add(pstuvo);
+                }
+
+                MsrSubjectPoint subjectPoint = new MsrSubjectPoint();
+                subjectPoint.setExamid(examid);
+                subjectPoint.setSubjectid(subjectid);
+                subjectPoint.setPointid(firstPoint.getTopPointid());
+                subjectPoint.setClassid(0);
+                subjectPoint.setPointname(firstPoint.getTopPointid());
+                subjectPoint.setFullscore(pointscore);
+                subjectPoint.setPointlevel(pointlevel);
+                subjectPoint.setMptqids(mptqidStr);
+                subjectPoint.setQns(qnStr);
+
+                //校知识点分析
+                MsrSubjectPoint schoolPoint = pointLevelClass(pointStuScores, subjectPoint);
+                saveSubjectPoints.add(schoolPoint);
+
+                //班级知识点分析
+                List<Integer> classIds = classStus.stream().map(MsClassStudent::getClassid).distinct().collect(Collectors.toList());
+                List<MsrSubjectPoint> classPoints = new ArrayList<>();
+                for (Integer classid : classIds) {
+                    // 获取班级下学生id
+                    List<Integer> classStuIds = classStus.stream().filter(c -> c.getClassid().equals(classid)).map(MsClassStudent::getStudentid).collect(Collectors.toList());
+                    // 获取班级下学生试题
+                    List<PointStudentVo> classStuPoints = pointStuScores.stream().filter(q -> classStuIds.contains(q.getStudentid())).collect(Collectors.toList());
+                    subjectPoint.setClassid(classid);
+                    MsrSubjectPoint classPoint = pointLevelClass(classStuPoints, subjectPoint);
+                    classPoints.add(classPoint);
+                }
+
+                // 班级知识点保存后，要对平均分排序
+                List<Double> avgScores = classPoints.stream().map(MsrSubjectPoint::getAvgscore).collect(Collectors.toList());
+                Map<Double,Integer> avgScoreRankMap = MarkingUtil.fspm(avgScores);
+                for(MsrSubjectPoint sp : classPoints){
+                    sp.setAvgrank(avgScoreRankMap.get(sp.getAvgscore()));
+                }
+                saveSubjectPoints.addAll(classPoints);
+
+                PointQuestionVo pqvo = new PointQuestionVo();
+                pqvo.setPointid(firstPoint.getTopPointid());
+                pqvo.setPointname(firstPoint.getPointname());
+                pqvo.setScore(pointscore);
+
+                //知识点结构与总分的相关性(三级知识点)
+                List<MsrSubjectPointSection> pointSecs = pointSection(pointStuScores, pointSections, pqvo, pointlevel);
+                savePointSections.addAll(pointSecs);
+
+                //知识点考生分组分析
+                List<MsrSubjectPointRankgroup> pointRankg = pointRankGroup(pointStuScores,sturanks, pqvo, examid, subjectid, pointlevel);
+                savePointRankgroups.addAll(pointRankg);
+            }
+        }
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportstu/PointQuestionVo.java

@@ -22,4 +22,5 @@ public class PointQuestionVo {
     private Double srate;//知识点试卷占比
 
     private List<QuestionPointVo> ques;//知识点包含试题
+
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportsubject/PointLevelVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.smarking.vo.report.reportsubject;
+
+import lombok.Data;
+
+/**
+ * @Description：层级知识点
+ * @Author: WN
+ * @Date: 2024/12/18 15:13:26
+ **/
+@Data
+public class PointLevelVo {
+
+    private String pointid;//知识点ID
+
+    private String pointname;//知识点名称
+
+    private String topPointid;//上层或顶层知识点id
+
+    private String topPointname;//上层或顶层知识点名称
+}

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportsubject/PointVo.java

@@ -0,0 +1,46 @@
+package com.xhkjedu.smarking.vo.report.reportsubject;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class PointVo {
+    //知识点表
+    private String pointid;
+
+    //知识点名称
+    private String pointname;
+
+    //知识点排序
+    private Integer pointorder;
+
+    //所属知识点id
+    private String pointpid;
+
+    private List<PointVo> children = new ArrayList<>();
+
+
+    public PointVo() {}
+
+    public PointVo(String pointid, String pointpid) {
+        this.pointid = pointid;
+        this.pointpid = pointpid;
+        this.children = new ArrayList<>();
+    }
+
+    public void addChild(PointVo child) {
+        children.add(child);
+    }
+
+    // 获取父节点的方法
+    public PointVo getParent(List<PointVo> allNodes) {
+        for (PointVo node : allNodes) {
+            if (node.getPointid().equals(this.pointpid)) {
+                return node;
+            }
+        }
+        return null;
+    }
+}

smarking/src/main/resources/mapper/paper/MsPaperBlockMapper.xml

@@ -15,7 +15,7 @@
             <result property="mbqtype" column="mbqtype"/>
             <result property="mptqid" column="mptqid"/>
             <result property="bqn" column="bqn"/>
-            <result property="bqscore" column="bqscore"/>
+            <result property="bqscore" column="qscore"/>
             <result property="bqorder" column="bqorder"/>
             <result property="mergeqid" column="mergeqid"/>
             <result property="mergeqn" column="mergeqn"/>
@@ -28,7 +28,7 @@
     <!--获取题块及题块下试题-->
     <select id="listPaperBlockQuestions" resultMap="paperBlockResultMap">
         select b.mblockid,b.mpid,b.blockname,b.blocktype,b.blockorder,b.bqnum,b.bqscore,
-        q.mbqid,q.mbqtype,q.mptqid,q.bqn,q.bqscore,q.bqorder,q.mergeqid,q.mergeqn,q.mergescore,q.scorestepway,q.scorestep
+        q.mbqid,q.mbqtype,q.mptqid,q.bqn,q.bqscore as qscore,q.bqorder,q.mergeqid,q.mergeqn,q.mergescore,q.scorestepway,q.scorestep
         from ms_paper_block b
         left join ms_paper_block_question q on b.mblockid=q.mblockid
         left join ms_paper p on b.mpid=p.mpid

smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectPointMapper.xml

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectPointMapper">
+
+    <!--获取科目对应知识点-->
+    <select id="listSubjectPoints" resultType="com.xhkjedu.smarking.vo.report.reportsubject.PointVo">
+        select p.pointid,p.pointname,p.pointorder,p.pointpid
+        from t_point p where p.subjectid=#{subjectid} and (p.belong=1 or (p.belong=3
+        and p.schoolid=(select schoolid from ms_exam where examid=#{examid} limit 1))) order by p.pointlevel,p.pointorder
+    </select>
+
 </mapper>