试卷知识点分析试题知识点分平均

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -162,12 +162,7 @@ public class EPaperQtypeService {
                 if(q.getOptionnum()==null){
                     q.setOptionnum(0);
                 }
-                /*Integer qorder = q.getQorder();
-                if (ptype == 1 && ctype != 11) {
-                    q.setQn(qorder.toString());
-                } else if (ptype == 1 && ctype == 11) {
-                    q.setQn(qorder + "." + (i + 1));
-                }*/
+
                 if(q.getCtype() == 14){
                     q.setGnum(900);//语文作文格数
                 }else if(q.getCtype() == 15){
@@ -195,42 +190,50 @@ public class EPaperQtypeService {
     }
 
     //保存试卷分析--题库
-    public void savePaperAnalyzeForQuestion(EPaper ePaper){
+    private void savePaperAnalyzeForQuestion(EPaper ePaper){
         //保存之前先清除之前的试卷分析
         ePaperAnalyzeMapper.deleteByEpid(ePaper.getEpid());
         //总体分析（主观题、客观题）
         List<EPaperQtypeVo> qtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(ePaper.getEpid());//试卷题型试题信息
-        List<EPaperQtypeQuestionVo> queslist = new ArrayList<>();//试卷中所有试题(子题)
-        List<Map> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
-        List<EPaperQtypeQuestion> uplist = new ArrayList<>();//如果是客观题则获取客观题选项数量更改试卷中客观题选项数量
+        List<EPaperQtypeQuestion> uplist = new ArrayList<>();//改试卷中客观题选项数量
+        List<QuestionOrderVo> pointqlist = new ArrayList<>();//用于存放知识点，以及知识点下得分
+        List<EPaperQtypeQuestionVo> mquestions = new ArrayList<>();//存放单题和母题
 
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
         List<Map> typelist = new ArrayList<>();//题型分析
         //处理出试卷中所有试题、知识点
         for(EPaperQtypeVo qt : qtypelist){
             List<Integer> qorderlist = new ArrayList<>();
-            for(EPaperQtypeQuestionVo q : qt.getQuestions()){
-                //处理试题关联知识点
-                List<Map> pointslist = q.getPoints();
-                if(pointslist != null && pointslist.size()>0){
-                    for(Map point : pointslist){
-                        Map p = new HashMap();
-                        p.put("pointid",point.get("pointid").toString());
-                        p.put("pointname",point.get("pointname").toString());
-                        p.put("eptqid",q.getEptqid());
-                        p.put("order",q.getQorder());
-                        p.put("score",q.getScore());
-                        quespoints.add(p);
-                    }
-                }
+            List<QuestionOrderVo> qtypeqlist = new ArrayList<>();
+            List<EPaperQtypeQuestionVo> tqlist = qt.getQuestions();
+            int hasmt = 0;
+            for(EPaperQtypeQuestionVo q : tqlist){
+                int ctype = q.getCtype();
+                //单题的pid设置为默认值，方便后续进行单题和母题处理
                 if(q.getQlevel()==1){
                     q.setQuestionpid("000");
+                    //判断试题是否是客观题
+                    if(N_Utils.isObjectiveQuestion(ctype)){
+                        //判断试题是否是客观题,暂时用mctype进行标识
+                        q.setMctype(111);
+                    }else{
+                        q.setMctype(112);
+                    }
+                    //设置知识点
+                    mquestions.add(q);
+                    //获取试题知识点
+                    List<Map> qpoints = q.getPoints();
+                    //处理试题知识点占分
+                    setPaperQuestionPointScore(pointqlist,qpoints,q,null,null);
+                    setPaperQuestionQtypeScore(qtypeqlist,q,null,null);//处理试题题型
+                }
+                if(q.getQlevel() == 3){
+                    hasmt ++;
                 }
-                queslist.add(q);
                 if(!qorderlist.contains(q.getQorder())){
                     qorderlist.add(q.getQorder());
                 }
-                int ctype = q.getCtype();
+                //为了处理客观题中选项数量
                 if(ctype == 1 || ctype ==2 || ctype==4 || ctype ==5 || ctype==6){
                     List<String> strlst = JSON.parseArray(q.getQoption(),String.class);
                     EPaperQtypeQuestion eqq = new EPaperQtypeQuestion();
@@ -240,54 +243,66 @@ public class EPaperQtypeService {
                 }
             }
 
+            if(hasmt > 0){
+                //说明该题型下有复合题,复合体进行知识点、题型下试题题号及id进行操作
+                Map<String,List<EPaperQtypeQuestionVo>> quesMap = tqlist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQuestionpid, Collectors.toList()));
+                for(Map.Entry<String, List<EPaperQtypeQuestionVo>> entry : quesMap.entrySet()){
+                    if(!entry.getKey().equals("000")){
+                        //说明该题为母题，
+                        EPaperQtypeQuestionVo mq = new EPaperQtypeQuestionVo();
+                        List<EPaperQtypeQuestionVo> sonques = entry.getValue();
+                        int k = 0;//如果k大于1说明有小题是主观题，则母题为主观题
+                        double score = 0;
+                        for(EPaperQtypeQuestionVo sq : sonques){
+                            if(!N_Utils.isObjectiveQuestion(sq.getCtype())){
+                                k++;
+                            }
+                            score = N_Utils.getDoubleSum(score,sq.getScore());
+                        }
+
+                        EPaperQtypeQuestionVo qobj = sonques.get(0);
+                        mq.setQuestionid(qobj.getQuestionpid());
+                        mq.setComplexity(qobj.getMcomplexity());
+                        mq.setQorder(qobj.getQorder());
+                        mq.setScore(score);
+                        if(k == 0){
+                            mq.setMctype(111);
+                        }else{
+                            mq.setMctype(112);
+                        }
+
+                        mquestions.add(mq);
+                        mq.setQlevel(qobj.getMqlevel());
+                        //获取所有子题的试题题号
+                        List<String> qns = sonques.stream().map(EPaperQtypeQuestionVo::getQn).collect(Collectors.toList());
+                        String[] qnstr = qns.stream().toArray(String[]::new);
+                        //所有子题的试题eptqid
+                        List<Integer> eptqids = sonques.stream().map(EPaperQtypeQuestionVo::getEptqid).collect(Collectors.toList());
+                        Integer[] eptqidstr = eptqids.stream().toArray(Integer[]::new);
+
+                        //获取知识点
+                        List<Map> qpoints = sonques.get(0).getPoints();
+                        mq.setPoints(qpoints);
+                        setPaperQuestionPointScore(pointqlist,qpoints,mq,qnstr,eptqidstr);
+                        setPaperQuestionQtypeScore(qtypeqlist,mq,qnstr,eptqidstr);//处理试题题型
+                    }
+                }
+            }
+
+            //试题题型分析数据
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
             Map tmap = new HashMap();
             tmap.put("qtname",qt.getEptname());
             tmap.put("num",qt.getEptnum());
             tmap.put("score",qt.getEptscore());
             tmap.put("srate",storerate);
-            tmap.put("qns",qorderlist);
+            tmap.put("ques",qtypeqlist);
             typelist.add(tmap);
         }
 
-        //获取出所有单题和母题,进行判断区分
-        Map<String,List<EPaperQtypeQuestionVo>> quesMap = queslist.stream().collect(Collectors.groupingBy(EPaperQtypeQuestionVo:: getQuestionpid, Collectors.toList()));
-        List<EPaperQtypeQuestionVo> mquestions = new ArrayList<>();//仅存放单题和母题
-        for(Map.Entry<String, List<EPaperQtypeQuestionVo>> entry : quesMap.entrySet()){
-            if(entry.getKey().equals("000")){
-                for(EPaperQtypeQuestionVo dq : entry.getValue()){
-                    if(N_Utils.isObjectiveQuestion(dq.getCtype())){
-                        //判断试题是否是客观题,暂时用mctype进行标识
-                        dq.setMctype(111);
-                    }else{
-                        dq.setMctype(112);
-                    }
-                    mquestions.add(dq);
-                }
-            }else{
-                EPaperQtypeQuestionVo mq = new EPaperQtypeQuestionVo();
-                List<EPaperQtypeQuestionVo> sonques = entry.getValue();
-                int k = 0;//如果k大于1说明有小题是主观题，则母题为主观题
-                double score = 0;
-                for(EPaperQtypeQuestionVo sq : sonques){
-                    if(!N_Utils.isObjectiveQuestion(sq.getCtype())){
-                        k++;
-                    }
-                    score = N_Utils.getDoubleSum(score,sq.getScore());
-                }
-
-                EPaperQtypeQuestionVo qobj = sonques.get(0);
-                mq.setQuestionid(qobj.getQuestionpid());
-                mq.setComplexity(qobj.getMcomplexity());
-                mq.setScore(score);
-                if(k == 0){
-                    mq.setMctype(111);
-                }else{
-                    mq.setMctype(112);
-                }
-
-                mquestions.add(mq);
-            }
+        //进行客观题选项处理
+        if(N_Utils.isListNotEmpty(uplist)){
+            ePaperQtypeQuestionMapper.updateBatchQuestionOptionnum(uplist);
         }
 
         //试题总体分布进行分析
@@ -325,22 +340,24 @@ public class EPaperQtypeService {
             clist.add(cmap);
         }
 
-        //知识点
-        Map<String,List<Map>> pointmap =  quespoints.stream().collect(Collectors.groupingBy(item -> item.get("pointid").toString(), Collectors.toList()));
+        //知识点分析
         List<Map> pointlist = new ArrayList<>();
-        for(Map.Entry<String, List<Map>> entry : pointmap.entrySet()){
-            Map pm = new HashMap();
-            List<Map> pvo = entry.getValue();
-            double cscore = pvo.stream().collect(Collectors.summingDouble(item -> Double.valueOf(item.get("score").toString())));
-            double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
-            List<Integer> thlist = pvo.stream().map(item -> Integer.parseInt(item.get("order").toString())).collect(Collectors.toList());
-            thlist = thlist.stream().distinct().collect(Collectors.toList());
-            pm.put("pointid",pvo.get(0).get("pointid").toString());
-            pm.put("pointname",pvo.get(0).get("pointname").toString());
-            pm.put("score",cscore);
-            pm.put("srate",scorerate);
-            pm.put("order",thlist);
-            pointlist.add(pm);
+        if(N_Utils.isListNotEmpty(pointqlist)){
+            Map<String,List<QuestionOrderVo>> pointmap = pointqlist.stream().collect(Collectors.groupingBy(QuestionOrderVo::getId,Collectors.toList()));
+            //根据指示进行分组，
+            for(Map.Entry<String, List<QuestionOrderVo>> entry : pointmap.entrySet()){
+                List<QuestionOrderVo> pgblist = entry.getValue();
+                //获取知识点的总分
+                Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
+                Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
+                Map prate = new HashMap();
+                prate.put("pointid",entry.getKey());
+                prate.put("pointname",pgblist.get(0).getName());
+                prate.put("score",score);
+                prate.put("srate",srate);
+                prate.put("ques",pgblist);
+                pointlist.add(prate);
+            }
         }
 
         EPaperAnalyze epa = new EPaperAnalyze();
@@ -350,11 +367,89 @@ public class EPaperQtypeService {
         epa.setComplexityjson(JSON.toJSONString(clist));//难易度分析
         epa.setPointjson(JSON.toJSONString(pointlist));//知识点分析
         ePaperAnalyzeMapper.insertUseGeneratedKeys(epa);
-        if(N_Utils.isListNotEmpty(uplist)){
-            ePaperQtypeQuestionMapper.updateBatchQuestionOptionnum(uplist);
+    }
+
+    //设置知识点
+    private void setPaperQuestionPointScore(List<QuestionOrderVo> pointqlist,List<Map> qpoints,EPaperQtypeQuestionVo dq,String[] qnstr,Integer[] eptqidstr){
+        if(N_Utils.isListNotEmpty(qpoints)){
+            if(qpoints.size() == 1){
+                //试题只有一个知识点
+                Map pointmap = qpoints.get(0);
+                QuestionOrderVo qpoint = new QuestionOrderVo();
+                qpoint.setId(pointmap.get("pointid").toString());
+                qpoint.setName(pointmap.get("pointname").toString());
+                qpoint.setOrder(dq.getQorder());
+                qpoint.setScore(dq.getScore());
+                qpoint.setQlevel(dq.getQlevel());
+                if(qnstr == null){
+                    qpoint.setQns(new String[]{dq.getQn()});
+                }else{
+                    qpoint.setQns(qnstr);
+                }
+                if(eptqidstr == null){
+                    qpoint.setEptqids(new Integer[]{dq.getEptqid()});
+                }else{
+                    qpoint.setEptqids(eptqidstr);
+                }
+
+                pointqlist.add(qpoint);
+            }else{
+                //试题有多个知识点
+                //计算每个知识点所占分值（平均分配）
+                Double[] avgps = ExamUtil.getPointAvgScore(qpoints.size(),dq.getScore());
+                for(int m = 0; m<qpoints.size();m++){
+                    Map pointmap = qpoints.get(m);
+                    QuestionOrderVo qpoint = new QuestionOrderVo();
+                    qpoint.setId(pointmap.get("pointid").toString());
+                    qpoint.setName(pointmap.get("pointname").toString());
+                    qpoint.setOrder(dq.getQorder());
+                    qpoint.setQlevel(dq.getQlevel());
+
+                    if(avgps.length == 2 && (m+1) == qpoints.size()){
+                        //不能整除分，并且是最后一个知识点
+                        qpoint.setScore(avgps[1]);
+                    }else{
+                        qpoint.setScore(avgps[0]);
+                    }
+
+                    //题号集合
+                    if(qnstr == null){
+                        qpoint.setQns(new String[]{dq.getQn()});
+                    }else{
+                        qpoint.setQns(qnstr);
+                    }
+                    //试卷中试题id集合
+                    if(eptqidstr == null){
+                        qpoint.setEptqids(new Integer[]{dq.getEptqid()});
+                    }else{
+                        qpoint.setEptqids(eptqidstr);
+                    }
+                    pointqlist.add(qpoint);
+                }
+            }
         }
     }
 
+    private void setPaperQuestionQtypeScore(List<QuestionOrderVo> qtypelist,EPaperQtypeQuestionVo dq,String[] qnstr,Integer[] eptqidstr){
+        QuestionOrderVo qtype = new QuestionOrderVo();
+        qtype.setId(dq.getQtypeid());
+        qtype.setName(dq.getQtypename());
+        qtype.setOrder(dq.getQorder());
+        qtype.setScore(dq.getScore());
+        qtype.setQlevel(dq.getQlevel());
+        if(qnstr == null){
+            qtype.setQns(new String[]{dq.getQn()});
+        }else{
+            qtype.setQns(qnstr);
+        }
+        if(eptqidstr == null){
+            qtype.setEptqids(new Integer[]{dq.getEptqid()});
+        }else{
+            qtype.setEptqids(eptqidstr);
+        }
+
+        qtypelist.add(qtype);
+    }
     //保存试卷分析--附件
     private void savePaperAnalyzeForFj(EPaper ePaper,List<EPaperQtype> fjtypelist,List<EPaperQtypeQuestion> queslist){
         //保存之前先清除之前的试卷分析

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -27,7 +27,6 @@ import com.xhkjedu.sexam.model.reportstu.ERStudentQtype;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
 import com.xhkjedu.sexam.model.reportstu.ERstudentPoint;
 import com.xhkjedu.sexam.utils.ExamUtil;
-import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 import com.xhkjedu.sexam.vo.report.ERClassScoreVo;

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.utils;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 
@@ -182,4 +183,28 @@ public class ExamUtil {
             return thiscount;
         }
     }
+
+    /**
+     * @Description 分值平均后得到的值，如果整除返回数组元素1，未整除返回元素数量2
+     * @Param [num, score] 数量，分值
+     * @Return java.lang.Double[] 第一个未平均分值，第二个值为最后一个数的分值
+     * @Author wn
+     * @Date 2022/8/18 11:07
+     **/
+    public static Double[] getPointAvgScore(int num,Double score){
+        BigDecimal bScore = new BigDecimal(Double.toString(score));
+        BigDecimal bNum = new BigDecimal(Integer.toString(num));
+
+        BigDecimal avg = bScore.divide(bNum, 1, BigDecimal.ROUND_DOWN);
+        BigDecimal avgAllScore = avg.multiply(bNum);//平均分乘以数量得到的分值
+        if(bScore.equals(avgAllScore)){
+            //说明整除
+            return new Double[]{avg.doubleValue()};
+        }else{
+            //未整除，计算最后剩余分值，subtract总分减去平均分和数量的积
+            // 平均分加上剩余得分得到最后一个分值
+            BigDecimal lastScore = avg.add(bScore.subtract(avgAllScore));
+            return new Double[]{avg.doubleValue(),lastScore.doubleValue()};
+        }
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQPointVo.java

@@ -1,19 +0,0 @@
-package com.xhkjedu.sexam.vo.paper;
-
-import lombok.Data;
-
-/**
- * @Description 知识点
- * @Author WN
- * Date 2022/7/19 10:03
- **/
-@Data
-public class EPaperQPointVo {
-    private String pointid;//知识点id
-    private String pointname;//知识点名称
-
-    private String questionid;//试题id
-    private Integer eptqid;//试题id
-    private double score;//分值
-    private Integer qorder;//试题排序
-}

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/QuestionOptionVo.java

@@ -1,17 +0,0 @@
-package com.xhkjedu.sexam.vo.paper;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description 阅读理解和完形填空
- * @Author WN
- * Date 2022/7/26 15:36
- **/
-@Data
-public class QuestionOptionVo {
-    private String sqstem; //题干
-
-    private List<String> sqoptions;//选项
-}

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/QuestionOrderVo.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+
+/**
+ * @Description 试题题号
+ * @Author WN
+ * Date 2022/8/18 14:01
+ **/
+@Data
+public class QuestionOrderVo {
+
+    private String id;
+
+    private String name;
+
+    //试题类型1单题2母题
+    private Integer qlevel;
+
+    private Double score;//试题分值
+
+    //试题题号（单题、母题） （子题不占题号）
+    private Integer order;
+
+    //试题题号对应子题在试卷中id(单题时数组长度为1)
+    private Integer[] eptqids;
+
+    //试题题号对应子题在试卷中显示的题号(单题时数组长度为1)
+    private String[] qns;
+}

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -14,17 +14,10 @@ import java.util.Map;
 
 @SpringBootTest
 class SexamApplicationTests {
-    @Resource
-    private EPaperQtypeService ePaperQtypeService;
 
     @Test
     void contextLoads() {
-        EPaper ePaper = new EPaper();
-        ePaper.setEpid(289);
-        ePaper.setPnum(7);
-        ePaper.setPscore(80.0);
 
-        ePaperQtypeService.savePaperAnalyzeForQuestion(ePaper);
     }
 
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/UserBasketService.java

@@ -65,6 +65,7 @@ public class UserBasketService {
         //英语学科时处理听力题
         if(sujectname.contains("英语")){
             List<QuestionVo> hearqs  = new ArrayList<>();
+            List<UserBasketVo> rtnbaskets = new ArrayList<>();
             for (UserBasketVo b : baskets) {
                 List<QuestionVo> questions = b.getQuestions();
 
@@ -74,11 +75,23 @@ public class UserBasketService {
 
                     questions = questions.stream().filter( o -> o.getHashear() ==0).collect(Collectors.toList());
                 }
-                b.setPtnum(questions.size());
+                /*b.setPtnum(questions.size());
                 Double scoretotal = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
                 b.setPtscore(scoretotal);
-                b.setQuestions(questions);
+                b.setQuestions(questions);*/
+
+                if(questions.size() > 0){
+                    UserBasketVo bn = new UserBasketVo();
+                    bn.setQtypeid(b.getQtypeid());
+                    bn.setQtypename(b.getQtypename());
+                    bn.setPtnum(questions.size());
+                    Double ptscore = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
+                    bn.setPtscore(ptscore);
+                    bn.setQuestions(questions);
+                    rtnbaskets.add(bn);
+                }
             }
+            baskets = new ArrayList<>(rtnbaskets);
 
             if(N_Utils.isListNotEmpty(hearqs)){
                 UserBasketVo tlvo = new UserBasketVo();