优化生成报告，是否生成pdf添加配置

sexam/src/main/java/com/xhkjedu/sexam/config/ConfigKey.java

@@ -76,4 +76,11 @@ public class ConfigKey {
         ConfigKey.ipregiondb = ipregiondb;
     }
 
+    public static boolean examHaspdf;//考试是否生产pdf报告
+
+    @Value("${exam.haspdf}")
+    public void setExamHaspdf(boolean examHaspdf){
+        ConfigKey.examHaspdf = examHaspdf;
+    }
+
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -275,6 +275,7 @@ public class EBaseController {
         try {
             eBase.setExammode(exammode);
             eBaseService.updateExamStateEnd(eBase);
+
             eReportGenerateService.generateExamReport(eBase.getExamid(), eBase.getCreateid());
             return new ResultVo(0, "结束成功");
         } catch (Exception e) {
@@ -458,7 +459,7 @@ public class EBaseController {
             eBaseService.generateExamReport(examid, createid);
             return new ResultVo(0, "生成成功");
         } catch (Exception e) {
-            log.error("生成失败："+e.getMessage());
+            log.error("生成失败：" + e.getMessage());
             return new ResultVo(1, "生成失败");
         }
     }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -72,6 +72,7 @@ public class EBaseService {
             model.setStushowrank(0);
             model.setDeleted(1);
             model.setReportstate(0);
+            model.setStuzero(1);//0分学生是否参与统计0不统计1统计
             model.setCreatetime(N_Utils.getSecondTimestamp());
 
             //考试关联班级，获取班级关联学校

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

@@ -59,65 +59,72 @@ public class EReportGenerateQuestionService {
     @Resource
     private ERStudentComplexityMapper erStudentComplexityMapper;
 
-    public void setClassQuestion(Integer examid, List<Map> subjects, List<Map> classes, EBase base){
-        Integer stuzero = base.getStuzero();//0分学生是否参与统计0不统计1统计(默认)
-        // 考试所有学生提交试卷作答情况 2023-12-27添加0分学生是否参与统计
-        List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
-        if (N_Utils.isListNotEmpty(stulist)) {
-            List<ERclassQtype> rtypelist = new ArrayList<>();// 班级题型
-            List<ERStudentQtype> stutypelist = new ArrayList<>();// 学生题型
-            List<ERclassQuestion> rqueslist = new ArrayList<>();// 班级试题
-            List<ERclassPoint> rpointlist = new ArrayList<>();// 班级知识点
-            List<ERstudentPoint> stupointlist = new ArrayList<>();// 学生知识点
-            List<ERclassComplexity> complist = new ArrayList<>();// 班级难易度
-            List<ERStudentComplexity> stucomplist = new ArrayList<>();// 学生难易度
-
-            for (Map map : subjects) {
-                String subjectid = map.get("subjectid").toString();
-                Integer epid = Integer.parseInt(map.get("epid").toString());// 获取试卷id
-                Integer ptype = Integer.parseInt(map.get("ptype").toString());// 试卷类型1题库2附件
-                ExamPaperClassVo examPaperClassVo = new ExamPaperClassVo();
-                examPaperClassVo.setExamid(examid);
-                examPaperClassVo.setEpid(epid);
-                examPaperClassVo.setSubjectid(subjectid);
-                examPaperClassVo.setClasses(classes);
-
-                // 获取试卷本身的分析
-                Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
-                // 获取指定试卷学生作答情况
-                List<EPaperStudentQuestion> paperstulist = stulist.stream().filter(s -> s.getEpid().equals(epid)).collect(Collectors.toList());
-                if (N_Utils.isListNotEmpty(paperstulist)) {
-                    if (ptype == 1) {
-                        // 处理题型下试题：题库显示题号时为母题的题号即order（qn是英语为顺延题号其他学科为母题号和子题排序拼接）
-                        String qtypejson = panalyze.get("qnumjson").toString();// 原试卷题型分析
-                        List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
-                        setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo, stuzero);
-
-                        // 处理知识点
-                        setEPaperQuestionPoints(panalyze, paperstulist, rpointlist, stupointlist, examPaperClassVo, stuzero);
-
-                        // 处理难易度
-                        String complexityjson = panalyze.get("complexityjson").toString();
-                        List<Map> complexitylist = JSON.parseArray(complexityjson, Map.class);
-                        setEPaperQuestionComplexitys(complexitylist, paperstulist, complist, stucomplist, examPaperClassVo, stuzero);
+    public void setClassQuestion(Integer examid, List<Map> subjects, List<Map> classes, EBase base) throws Exception {
+
+        try {
+            Integer stuzero = base.getStuzero();//0分学生是否参与统计0不统计1统计(默认)
+            // 考试所有学生提交试卷作答情况 2023-12-27添加0分学生是否参与统计
+            List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
+            if (N_Utils.isListNotEmpty(stulist)) {
+                List<ERclassQtype> rtypelist = new ArrayList<>();// 班级题型
+                List<ERStudentQtype> stutypelist = new ArrayList<>();// 学生题型
+                List<ERclassQuestion> rqueslist = new ArrayList<>();// 班级试题
+                List<ERclassPoint> rpointlist = new ArrayList<>();// 班级知识点
+                List<ERstudentPoint> stupointlist = new ArrayList<>();// 学生知识点
+                List<ERclassComplexity> complist = new ArrayList<>();// 班级难易度
+                List<ERStudentComplexity> stucomplist = new ArrayList<>();// 学生难易度
+
+                for (Map map : subjects) {
+                    String subjectid = map.get("subjectid").toString();
+                    Integer epid = Integer.parseInt(map.get("epid").toString());// 获取试卷id
+                    Integer ptype = Integer.parseInt(map.get("ptype").toString());// 试卷类型1题库2附件
+                    ExamPaperClassVo examPaperClassVo = new ExamPaperClassVo();
+                    examPaperClassVo.setExamid(examid);
+                    examPaperClassVo.setEpid(epid);
+                    examPaperClassVo.setSubjectid(subjectid);
+                    examPaperClassVo.setClasses(classes);
+
+                    // 获取试卷本身的分析
+                    Map panalyze = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
+                    // 获取指定试卷学生作答情况
+                    List<EPaperStudentQuestion> paperstulist = stulist.stream().filter(s -> s.getEpid().equals(epid)).collect(Collectors.toList());
+                    if (N_Utils.isListNotEmpty(paperstulist)) {
+                        if (ptype == 1) {
+                            // 处理题型下试题：题库显示题号时为母题的题号即order（qn是英语为顺延题号其他学科为母题号和子题排序拼接）
+                            String qtypejson = panalyze.get("qnumjson").toString();// 原试卷题型分析
+                            List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
+                            setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo, stuzero);
+
+                            // 处理知识点
+                            setEPaperQuestionPoints(panalyze, paperstulist, rpointlist, stupointlist, examPaperClassVo, stuzero);
+
+                            // 处理难易度
+                            String complexityjson = panalyze.get("complexityjson").toString();
+                            List<Map> complexitylist = JSON.parseArray(complexityjson, Map.class);
+                            setEPaperQuestionComplexitys(complexitylist, paperstulist, complist, stucomplist, examPaperClassVo, stuzero);
 
-                    } else {
-                        // 处理题型及题型下试题：附件显示题号为qn（order）作为排序使用
-                        String qtypejson = panalyze.get("qnumjson").toString();// 原试卷题型分析
-                        List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
-                        setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo,stuzero);
+                        } else {
+                            // 处理题型及题型下试题：附件显示题号为qn（order）作为排序使用
+                            String qtypejson = panalyze.get("qnumjson").toString();// 原试卷题型分析
+                            List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
+                            setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo,stuzero);
+                        }
                     }
                 }
-            }
 
-            eRclassQtypeMapper.insertList(rtypelist);
-            eRstudentQtypeMapper.insertList(stutypelist);
-            eRclassQuestionMapper.insertList(rqueslist);
-            if (N_Utils.isListNotEmpty(complist)) eRclassComplexityMapper.insertList(complist);
-            if (N_Utils.isListNotEmpty(stucomplist)) erStudentComplexityMapper.insertList(stucomplist);
-            if (N_Utils.isListNotEmpty(rpointlist)) eRclassPointMapper.insertList(rpointlist);
-            if (N_Utils.isListNotEmpty(stupointlist)) eRstudentPointMapper.insertList(stupointlist);
+                eRclassQtypeMapper.insertList(rtypelist);
+                eRstudentQtypeMapper.insertList(stutypelist);
+                eRclassQuestionMapper.insertList(rqueslist);
+                if (N_Utils.isListNotEmpty(complist)) eRclassComplexityMapper.insertList(complist);
+                if (N_Utils.isListNotEmpty(stucomplist)) erStudentComplexityMapper.insertList(stucomplist);
+                if (N_Utils.isListNotEmpty(rpointlist)) eRclassPointMapper.insertList(rpointlist);
+                if (N_Utils.isListNotEmpty(stupointlist)) eRstudentPointMapper.insertList(stupointlist);
+            }
+        }catch (Exception e){
+            log.error("生成试题相关报告出错：" + e.getMessage());
+            throw new Exception("生成试题相关报告失败");
         }
+
     }
 
     // 题型、试题、知识点、难易度--处理学生选项情况和得分情况

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.config.ConfigKey;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
@@ -296,7 +297,9 @@ public class EReportGenerateService {
 
         setAction(examid, userMap);//行为分析
         eBaseMapper.updateExamState(examid,3);
-        htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
+        if(ConfigKey.examHaspdf){
+            htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
+        }
     }
 
     /**
@@ -1905,7 +1908,7 @@ public class EReportGenerateService {
 
     //题型、试题、知识点
     @Transactional(rollbackFor = Exception.class)
-    public void saveClassQuestions(Integer examid) {
+    public void saveClassQuestions(Integer examid) throws Exception {
         List<Map> classes = eClassMapper.listByExamId(examid);
         Integer exammode = eReportGenerateMapper.getExamModeById(examid);
         List<Map> subjects = eReportGenerateMapper.listSubject(examid, exammode);

sexam/src/main/resources/application.properties

@@ -96,6 +96,8 @@ exam.face=https://face.xhkjedu.com/
 
 #配置考试结束时间范围
 exam.endtime=30
+#是否生产pdf报告true生成false不生成
+exam.haspdf=false
 
 #开启spring的aop配置，默认true
 spring.aop.auto=true