优化生产报告无学生时知识点

gateway/src/main/java/com/xhkjedu/gateway/interceptors/DecryptRequestBodyAdvice.java

@@ -1,116 +0,0 @@
-//package com.xhkjedu.gateway.interceptors;
-//
-//import com.xhkjedu.gateway.utils.AES;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.core.MethodParameter;
-//import org.springframework.http.HttpHeaders;
-//import org.springframework.http.HttpInputMessage;
-//import org.springframework.http.converter.HttpMessageConverter;
-//import org.springframework.util.CollectionUtils;
-//import org.springframework.util.StreamUtils;
-//import org.springframework.web.bind.annotation.ControllerAdvice;
-//import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdvice;
-//
-//import javax.crypto.BadPaddingException;
-//import javax.crypto.IllegalBlockSizeException;
-//import javax.crypto.NoSuchPaddingException;
-//import java.io.ByteArrayInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.UnsupportedEncodingException;
-//import java.lang.reflect.Type;
-//import java.security.InvalidKeyException;
-//import java.security.NoSuchAlgorithmException;
-//import java.util.List;
-//
-///**
-// * @ClassName DecryptRequestBodyAdvice
-// * Description TODO AES解密  （在网关中不可用）
-// * Author WN
-// * Date 2021/5/12 11:34
-// **/
-//@Slf4j
-//@ControllerAdvice
-//public class DecryptRequestBodyAdvice implements RequestBodyAdvice {
-//
-//    private static String AES_KEY = "XINGHUOLIAOYUAN7";
-//
-//    /** 此处如果返回false , 则不执行当前Advice的业务 */
-//    @Override
-//    public boolean supports(MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
-////       log.info("----support----");
-//        return true;
-//    }
-//
-//    /**
-//     * @title 读取参数前执行
-//     * @description 在此做些编码 / 解密 / 封装参数为对象的操作
-//     **/
-//    @Override
-//    public HttpInputMessage beforeBodyRead(HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) throws IOException {
-////        log.info("----beforeBodyRead----");
-//
-//        //AES解密，false不需要解密
-//        List<String> decrypts = httpInputMessage.getHeaders().get("st");
-//        String decrypt = isListNotEmpty(decrypts)?decrypts.get(0):"false";
-//        if (!decrypt.equals("true")) {
-//            return httpInputMessage;
-//        }
-//        // 读取加密的请求体
-//        byte[] body = StreamUtils.copyToByteArray(httpInputMessage.getBody());
-//        String str = new String(body,"utf-8");
-//
-//        try {
-//            // 使用AES解密
-//            body = AES.decryptForByte(str, AES_KEY);
-//        } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException |
-//                BadPaddingException | UnsupportedEncodingException e) {
-//            e.printStackTrace();
-//            throw new RuntimeException(e);
-//        } catch (Exception e){
-//            e.printStackTrace();
-//            throw new RuntimeException(e);
-//        }
-//
-//        // 使用解密后的数据，构造新的读取流
-//        InputStream rawInputStream = new ByteArrayInputStream(body);
-//        return new HttpInputMessage() {
-//            @Override
-//            public HttpHeaders getHeaders() {
-//                return httpInputMessage.getHeaders();
-//            }
-//
-//            @Override
-//            public InputStream getBody() throws IOException {
-//                return rawInputStream;
-//            }
-//        };
-//    }
-//
-//    /**
-//     * @title 读取参数后执行
-//     * @author Xingbz
-//     */
-//    @Override
-//    public Object afterBodyRead(Object o, HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
-////        log.info("afterBodyRead:----");
-//        return o;
-//    }
-//
-//    /**
-//     * @title 无请求时的处理
-//     */
-//    @Override
-//    public Object handleEmptyBody(Object o, HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
-////        log.info("handleEmptyBody:----");
-//        return o;
-//    }
-//
-//    private static boolean isListNotEmpty(List list) {
-//        if (CollectionUtils.isEmpty(list)){
-//            return false;
-//        } else {
-//            return true;
-//        }
-//    }
-//}

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperreport/PaperReportService.java

@@ -398,7 +398,7 @@ public class PaperReportService {
             // 获取原来作业本身试题分析
             TPaperAnalyze paperAnalyze = paperAnalyzeMapper.getAnalyzeByPaperid(paper.getPaperid());
             setPaperQuestionForQues(stuQschoolMap, stuSchoolMap, rclassQuesList, paper);//试题分析
-            setPaperQuestionPoint(stuQlist, rclassPointList, paperAnalyze);// 知识点分析
+            setPaperQuestionPoint(stuQlist,stuList, rclassPointList, paperAnalyze);// 知识点分析
             setPaperQuestionStuForQues(stuQlist, rstuList, paper);// 学生得分
         }
         if (N_Utils.isListNotEmpty(rclassList)) paperRclassMapper.insertList(rclassList);
@@ -618,7 +618,7 @@ public class PaperReportService {
         }
     }
 
-    // 班级作业试题情况-题库作业试题分析(未提交学生参与计算、未作答班级生产报告)
+    // 班级作业试题情况-题库作业试题分析
     private void setPaperQuestionForQues(Map<Integer, List<PaperRStuQuestionVo>> stuQschoolMap, Map<Integer, List<PaperRStuVo>> stuSchoolMap, List<PaperRclassQuestion> rclassQuesList,
                                           TPaper paper) {
         List<PaperRQuestionVo> quesList = paperStudentQuestionMapper.listAllQuesByPaperid(paper.getPaperid());// 获取试卷中所有试题
@@ -852,119 +852,132 @@ public class PaperReportService {
     }
 
     // 班级作业试题情况-题库作业知识点分析
-    private void setPaperQuestionPoint(List<PaperRStuQuestionVo> stuQschoolList, List<PaperRclassPoint> rclassPointList, TPaperAnalyze paperAnalyze) {
-        // 原试卷知识点分析
-        String pointjson = paperAnalyze.getPointjson();
-        List<Map> pointlist = JSON.parseArray(pointjson, Map.class);
-
-        // 试题对应知识点关系
-        String quespointjson = paperAnalyze.getQuespointjson();
-        List<QuestionPointVo> quepointlist = JSON.parseArray(quespointjson, QuestionPointVo.class);
-
-        List<PaperPointStuScoreVo> gradestulist = new ArrayList<>();// 每个知识点每个学生的得分
-        for (int i = 0; i < quepointlist.size(); i++) {
-            QuestionPointVo qpoint = quepointlist.get(i);
-            List<Map> points = qpoint.getPointids();
-            if (N_Utils.isListNotEmpty(points)) {
-                if (qpoint.getQlevel() == 1 || !N_Utils.isEmptyInteger(qpoint.getPtqid())) {
-                    // 说明本题为单题,获取该题下所有学生的得分情况
-                    List<PaperRStuQuestionVo> stuqueslist = stuQschoolList.stream().filter(s -> s.getPtqid().equals(qpoint.getPtqid())).collect(Collectors.toList());
-                    for (PaperRStuQuestionVo sq : stuqueslist) {
-                        setEPaperQuestionPointsForStuQues(gradestulist, sq, points, qpoint.getPtqid().toString());
-                    }
-                } else {
-                    // 说明该题为复合题，获取所有子题
-                    List<Integer> eptqids = qpoint.getPtqids();
-                    String eptqidsStr = eptqids.stream().map(String::valueOf).collect(Collectors.joining(","));
-                    List<PaperRStuQuestionVo> stuqueslist = stuQschoolList.stream().filter(s -> eptqids.contains(s.getPtqid())).collect(Collectors.toList());
-                    // 根据每个学生分组获取每个学生该题分值:因一份作业可能发给多个班级的同一个学生，所有需要按学校班级分组后再按学生算
-                    Map<Integer,List<PaperRStuQuestionVo>> schoolQueMap = stuqueslist.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getSchoolid));
-                    for(Map.Entry<Integer,List<PaperRStuQuestionVo>> schoolQueEntry : schoolQueMap.entrySet()){
-                        List<PaperRStuQuestionVo> classQueList = schoolQueEntry.getValue();
-                        Map<Integer,List<PaperRStuQuestionVo>> classQueMap = classQueList.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getClassid));
-                        for(Map.Entry<Integer,List<PaperRStuQuestionVo>> sclassQueEntry : classQueMap.entrySet()){
-                            List<PaperRStuQuestionVo> stuQueList = sclassQueEntry.getValue();
-
-                            Map<Integer, List<PaperRStuQuestionVo>> stuquesmap = stuQueList.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getStudentid));
-                            for (Map.Entry<Integer, List<PaperRStuQuestionVo>> entry : stuquesmap.entrySet()) {
-                                List<PaperRStuQuestionVo> stuques = entry.getValue();
-                                Double stuscore = stuques.stream().mapToDouble(PaperRStuQuestionVo::getStuscore).sum();
-                                stuscore = N_Utils.formatDouble(stuscore, 1);
-                                PaperRStuQuestionVo sqfirst = stuques.get(0);
-                                PaperRStuQuestionVo sq = new PaperRStuQuestionVo();
-                                sq.setStudentid(entry.getKey());
-                                sq.setClassid(sqfirst.getClassid());
-                                sq.setStuscore(stuscore);
-                                sq.setPaperid(sqfirst.getPaperid());
-                                sq.setSchoolid(sqfirst.getSchoolid());
-                                setEPaperQuestionPointsForStuQues(gradestulist, sq, points, eptqidsStr);
+    private void setPaperQuestionPoint(List<PaperRStuQuestionVo> stuQschoolList,List<PaperRStuVo> stuList, List<PaperRclassPoint> rclassPointList, TPaperAnalyze paperAnalyze) {
+
+        //获取学校提交作业学生数量，无学生提交时不生成试题得分率
+        List<PaperRStuVo> commitStuList = stuList.stream().filter(s -> s.getPsstate() > 0).collect(Collectors.toList());
+
+        if(N_Utils.isListNotEmpty(commitStuList)){
+            // 原试卷知识点分析
+            String pointjson = paperAnalyze.getPointjson();
+            List<Map> pointlist = JSON.parseArray(pointjson, Map.class);
+
+            // 试题对应知识点关系
+            String quespointjson = paperAnalyze.getQuespointjson();
+            List<QuestionPointVo> quepointlist = JSON.parseArray(quespointjson, QuestionPointVo.class);
+
+            List<PaperPointStuScoreVo> gradestulist = new ArrayList<>();// 每个知识点每个学生的得分
+            for (int i = 0; i < quepointlist.size(); i++) {
+                QuestionPointVo qpoint = quepointlist.get(i);
+                List<Map> points = qpoint.getPointids();
+                if (N_Utils.isListNotEmpty(points)) {
+                    if (qpoint.getQlevel() == 1 || !N_Utils.isEmptyInteger(qpoint.getPtqid())) {
+                        // 说明本题为单题,获取该题下所有学生的得分情况
+                        List<PaperRStuQuestionVo> stuqueslist = stuQschoolList.stream().filter(s -> s.getPtqid().equals(qpoint.getPtqid())).collect(Collectors.toList());
+                        for (PaperRStuQuestionVo sq : stuqueslist) {
+                            setEPaperQuestionPointsForStuQues(gradestulist, sq, points, qpoint.getPtqid().toString());
+                        }
+                    } else {
+                        // 说明该题为复合题，获取所有子题
+                        List<Integer> eptqids = qpoint.getPtqids();
+                        String eptqidsStr = eptqids.stream().map(String::valueOf).collect(Collectors.joining(","));
+                        List<PaperRStuQuestionVo> stuqueslist = stuQschoolList.stream().filter(s -> eptqids.contains(s.getPtqid())).collect(Collectors.toList());
+                        // 根据每个学生分组获取每个学生该题分值:因一份作业可能发给多个班级的同一个学生，所有需要按学校班级分组后再按学生算
+                        Map<Integer,List<PaperRStuQuestionVo>> schoolQueMap = stuqueslist.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getSchoolid));
+                        for(Map.Entry<Integer,List<PaperRStuQuestionVo>> schoolQueEntry : schoolQueMap.entrySet()){
+                            List<PaperRStuQuestionVo> classQueList = schoolQueEntry.getValue();
+                            Map<Integer,List<PaperRStuQuestionVo>> classQueMap = classQueList.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getClassid));
+                            for(Map.Entry<Integer,List<PaperRStuQuestionVo>> sclassQueEntry : classQueMap.entrySet()){
+                                List<PaperRStuQuestionVo> stuQueList = sclassQueEntry.getValue();
+
+                                Map<Integer, List<PaperRStuQuestionVo>> stuquesmap = stuQueList.stream().collect(Collectors.groupingBy(PaperRStuQuestionVo::getStudentid));
+                                for (Map.Entry<Integer, List<PaperRStuQuestionVo>> entry : stuquesmap.entrySet()) {
+                                    List<PaperRStuQuestionVo> stuques = entry.getValue();
+                                    Double stuscore = stuques.stream().mapToDouble(PaperRStuQuestionVo::getStuscore).sum();
+                                    stuscore = N_Utils.formatDouble(stuscore, 1);
+                                    PaperRStuQuestionVo sqfirst = stuques.get(0);
+                                    PaperRStuQuestionVo sq = new PaperRStuQuestionVo();
+                                    sq.setStudentid(entry.getKey());
+                                    sq.setClassid(sqfirst.getClassid());
+                                    sq.setStuscore(stuscore);
+                                    sq.setPaperid(sqfirst.getPaperid());
+                                    sq.setSchoolid(sqfirst.getSchoolid());
+                                    setEPaperQuestionPointsForStuQues(gradestulist, sq, points, eptqidsStr);
+                                }
                             }
                         }
                     }
                 }
             }
-        }
-
-        // 根据试卷知识点分析进行生成班级、学校知识点分析
-        for (Map map : pointlist) {
-            String pointid = map.get("pointid").toString();
-            String pointname = map.get("pointname").toString();
-            Double pointscore = Double.parseDouble(map.get("score").toString());
-            // Double pointrate = Double.parseDouble(map.get("srate").toString());
-            List<Map> qorders = (List<Map>) map.get("ques");
-            List<Integer> orders = qorders.stream().map(s -> Integer.parseInt(s.get("order").toString())).collect(Collectors.toList());
-            String orderstr = orders.stream().map(String::valueOf).collect(Collectors.joining(","));//试题
-            // 单个知识点学生得分情况:一个知识对应一个或多个试题，
-            List<PaperPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
-
-            List<PaperPointStuScoreVo> pointstuscorelist = new ArrayList<>(); // 知识点下多个试题，处理成单个学生总分值情况
-            Map<Integer, List<PaperPointStuScoreVo>> pointstuscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getStudentid));
-            for (Map.Entry<Integer, List<PaperPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
-                List<PaperPointStuScoreVo> stuscorelist = entry.getValue();
-                Double stuscore = stuscorelist.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
-                stuscore = N_Utils.formatDouble(stuscore, 1);
-
-                PaperPointStuScoreVo sscorevofirst = stuscorelist.get(0);
-                PaperPointStuScoreVo sscorevo = new PaperPointStuScoreVo();
-                sscorevo.setStudentid(sscorevofirst.getStudentid());
-                sscorevo.setClassid(sscorevofirst.getClassid());
-                sscorevo.setStuscore(stuscore);
-                sscorevo.setSchoolid(sscorevofirst.getSchoolid());
-                pointstuscorelist.add(sscorevo);
-            }
 
-            Map<Integer, List<PaperPointStuScoreVo>> schoolStuMap = pointstuscorelist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getSchoolid));
-            for (Map.Entry<Integer, List<PaperPointStuScoreVo>> schoolentry : schoolStuMap.entrySet()) {
-                List<PaperPointStuScoreVo> schoolStuList = schoolentry.getValue();
-                double schoolScore = pointscore * schoolStuList.size();
-                double schoolStuScore = schoolStuList.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
-                double schoolScorerate = N_Utils.getDoubleDivideAndMulitiply(schoolStuScore, schoolScore);
-                double schoolLostrate = N_Utils.getDoubleReduce(100.0, schoolScorerate);
-
-                // 学校下班级内学生试题
-                Map<Integer, List<PaperPointStuScoreVo>> classStuMap = schoolStuList.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getClassid));
-                for (Map.Entry<Integer, List<PaperPointStuScoreVo>> classMap : classStuMap.entrySet()) {
-                    List<PaperPointStuScoreVo> classStuList = classMap.getValue();
-                    PaperPointStuScoreVo pstuqVo = classStuList.get(0);
-                    double classScore = pointscore * classStuList.size();
-                    double classStuScore = classStuList.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
-                    double classScorerate = N_Utils.getDoubleDivideAndMulitiply(classStuScore, classScore);
-                    double classLostrate = N_Utils.getDoubleReduce(100.0, classScorerate);
+            //把提交学生进行分组
+            Map<Integer,List<PaperRStuVo>> schoolCommitStuList = commitStuList.stream().collect(Collectors.groupingBy(PaperRStuVo :: getSchoolid));
+
+            // 根据试卷知识点分析进行生成班级、学校知识点分析
+            for (Map map : pointlist) {
+                String pointid = map.get("pointid").toString();
+                String pointname = map.get("pointname").toString();
+                Double pointscore = Double.parseDouble(map.get("score").toString());
+                // Double pointrate = Double.parseDouble(map.get("srate").toString());
+                List<Map> qorders = (List<Map>) map.get("ques");
+                List<Integer> orders = qorders.stream().map(s -> Integer.parseInt(s.get("order").toString())).collect(Collectors.toList());
+                String orderstr = orders.stream().map(String::valueOf).collect(Collectors.joining(","));//试题
+                // 单个知识点学生得分情况:一个知识对应一个或多个试题，
+                List<PaperPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
+
+                List<PaperPointStuScoreVo> pointstuscorelist = new ArrayList<>(); // 知识点下多个试题，处理成单个学生总分值情况
+                Map<Integer, List<PaperPointStuScoreVo>> pointstuscoremap = gradepointstulist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getStudentid));
+                for (Map.Entry<Integer, List<PaperPointStuScoreVo>> entry : pointstuscoremap.entrySet()) {
+                    List<PaperPointStuScoreVo> stuscorelist = entry.getValue();
+                    Double stuscore = stuscorelist.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
+                    stuscore = N_Utils.formatDouble(stuscore, 1);
+
+                    PaperPointStuScoreVo sscorevofirst = stuscorelist.get(0);
+                    PaperPointStuScoreVo sscorevo = new PaperPointStuScoreVo();
+                    sscorevo.setStudentid(sscorevofirst.getStudentid());
+                    sscorevo.setClassid(sscorevofirst.getClassid());
+                    sscorevo.setStuscore(stuscore);
+                    sscorevo.setSchoolid(sscorevofirst.getSchoolid());
+                    pointstuscorelist.add(sscorevo);
+                }
 
-                    PaperRclassPoint ppoint = new PaperRclassPoint();
-                    ppoint.setPaperid(paperAnalyze.getPaperid());
-                    ppoint.setClassid(pstuqVo.getClassid());
-                    ppoint.setPointid(pointid);
-                    ppoint.setPointname(pointname);
-                    ppoint.setClassscorerate(classScorerate);
-                    ppoint.setClasslostrate(classLostrate);
-                    ppoint.setSchoolscorerate(schoolScorerate);
-                    ppoint.setSchoollostrate(schoolLostrate);
-                    ppoint.setQns(orderstr);
-                    rclassPointList.add(ppoint);
+                Map<Integer, List<PaperPointStuScoreVo>> schoolStuMap = pointstuscorelist.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getSchoolid));
+                for (Map.Entry<Integer, List<PaperPointStuScoreVo>> schoolentry : schoolStuMap.entrySet()) {
+                    Integer schoolid = schoolentry.getKey();
+                    //当学校有学生提交作业时进行计算知识点
+                    if(schoolCommitStuList.containsKey(schoolid)){
+                        List<PaperPointStuScoreVo> schoolStuList = schoolentry.getValue();
+                        double schoolScore = pointscore * schoolStuList.size();
+                        double schoolStuScore = schoolStuList.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
+                        double schoolScorerate = N_Utils.getDoubleDivideAndMulitiply(schoolStuScore, schoolScore);
+                        double schoolLostrate = N_Utils.getDoubleReduce(100.0, schoolScorerate);
+
+                        // 学校下班级内学生试题
+                        Map<Integer, List<PaperPointStuScoreVo>> classStuMap = schoolStuList.stream().collect(Collectors.groupingBy(PaperPointStuScoreVo::getClassid));
+                        for (Map.Entry<Integer, List<PaperPointStuScoreVo>> classMap : classStuMap.entrySet()) {
+                            List<PaperPointStuScoreVo> classStuList = classMap.getValue();
+                            PaperPointStuScoreVo pstuqVo = classStuList.get(0);
+                            double classScore = pointscore * classStuList.size();
+                            double classStuScore = classStuList.stream().mapToDouble(PaperPointStuScoreVo::getStuscore).sum();
+                            double classScorerate = N_Utils.getDoubleDivideAndMulitiply(classStuScore, classScore);
+                            double classLostrate = N_Utils.getDoubleReduce(100.0, classScorerate);
+
+                            PaperRclassPoint ppoint = new PaperRclassPoint();
+                            ppoint.setPaperid(paperAnalyze.getPaperid());
+                            ppoint.setClassid(pstuqVo.getClassid());
+                            ppoint.setPointid(pointid);
+                            ppoint.setPointname(pointname);
+                            ppoint.setClassscorerate(classScorerate);
+                            ppoint.setClasslostrate(classLostrate);
+                            ppoint.setSchoolscorerate(schoolScorerate);
+                            ppoint.setSchoollostrate(schoolLostrate);
+                            ppoint.setQns(orderstr);
+                            rclassPointList.add(ppoint);
+                        }
+                    }
                 }
-            }
 
+            }
         }
     }