报告接口测试及完善

smarking/src/main/java/com/xhkjedu/smarking/controller/report/XkReportController.java

@@ -55,7 +55,7 @@ public class XkReportController {
      * @Param [params]
      * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/xkst_Nd")
+    @PostMapping("/xkst_nd")
     public ResultVo listQuestionForXhXhstNdGroup(@RequestBody ExamReportParams params){
         N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
         return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForXhXhstNdGroup(params));

smarking/src/main/java/com/xhkjedu/smarking/controller/report/ZhReportController.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.model.exam.MsSubject;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
-import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudentAction;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
 import com.xhkjedu.smarking.service.report.report.*;

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsTemplateMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.paper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.paper.MsTemplate;
+import com.xhkjedu.smarking.vo.scan.TemplateVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,7 +31,7 @@ public interface MsTemplateMapper extends TkMapper<MsTemplate> {
     int getUnSelTemplateCount(@Param("mpid")Integer mpid);
 
     //试卷所有模板信息
-    List<Map<String,Object>> listTemplateBlockQueByMpid(@Param("mpid") Integer mpid);
+    List<TemplateVo> listTemplateBlockQueByMpid(@Param("mpid") Integer mpid);
 
     //获取模版详情和考试id
     MsTemplate getTemplateAndExamidByMtid(@Param("mtid") Integer mtid);

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassSubjectGradeMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
 public interface MsrClassSubjectGradeMapper extends TkMapper<MsrClassSubjectGrade> {
 
     //综合报告-试题汇总表-全部班级-科目情况-四率等级分析
-    List<MsrClassSubjectGrade> listSubjectGrade(@Param("sg")MsrClassSubjectGrade sg);
+    List<Map<String,Object>> listSubjectGrade(@Param("sg")MsrClassSubjectGrade sg);
 
     //综合报告-班级对比-全科及格率分析
     List<MsrClassSubjectGrade> listSubjectGradeForQk(@Param("examid") Integer examid,@Param("reportcode") String reportcode);

smarking/src/main/java/com/xhkjedu/smarking/service/report/report/MsrClassQuestionService.java

@@ -55,7 +55,7 @@ public class MsrClassQuestionService {
         subjectGrade.setClassid(0);
         subjectGrade.setReportcode("zh");
         //获取科目四率
-        List<MsrClassSubjectGrade> subjectGradeList = msrClassSubjectGradeMapper.listSubjectGrade(subjectGrade);
+        List<Map<String,Object>> subjectGradeList = msrClassSubjectGradeMapper.listSubjectGrade(subjectGrade);
         subjectMap.put("subjectGradeList",subjectGradeList);
 
         //获取四率参数
@@ -83,7 +83,7 @@ public class MsrClassQuestionService {
             List<Map<String,Object>> allSchool = questionList.stream().filter(m -> m.get("classid").equals(0)).collect(Collectors.toList());
             for(Map<String,Object> school : allSchool){
                 school.put("classname","学校全体");
-                if(school.get("qtype").equals("1")){
+                if(school.get("qtype").equals(1)){
                     objlist.add(school);
                 }else{
                     sublist.add(school);
@@ -94,7 +94,7 @@ public class MsrClassQuestionService {
                 List<Map<String,Object>> classQues = questionList.stream().filter(m -> m.get("classid").equals(c.getClassid())).collect(Collectors.toList());
                 for(Map<String,Object> cq : classQues){
                     cq.put("classname",c.getClassname());
-                    if(cq.get("qtype").equals("1")){
+                    if(cq.get("qtype").equals(1)){
                         objlist.add(cq);
                     }else{
                         sublist.add(cq);
@@ -102,8 +102,8 @@ public class MsrClassQuestionService {
                 }
             }
         }else{
-            objlist = questionList.stream().filter(m -> m.get("qtype").equals("1")).collect(Collectors.toList());
-            sublist = questionList.stream().filter(m -> m.get("qtype").equals("2")).collect(Collectors.toList());
+            objlist = questionList.stream().filter(m -> m.get("qtype").equals(1)).collect(Collectors.toList());
+            sublist = questionList.stream().filter(m -> m.get("qtype").equals(2)).collect(Collectors.toList());
         }
 
         Map<String,Object> rtnMap = new HashMap<>();
@@ -259,8 +259,8 @@ public class MsrClassQuestionService {
         }
 
         Map<String,Object> rtnMap = new HashMap<>();
-        rtnMap.put("firstN",firstN);
-        rtnMap.put("lastN",lastN);
+        rtnMap.put("firstN",firstN.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList()));
+        rtnMap.put("lastN",lastN.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList()));
         rtnMap.put("qfdList",qfdList);
         return rtnMap;
     }
@@ -358,7 +358,11 @@ public class MsrClassQuestionService {
                 classMap.put("classid",classid);
                 MsrClassQuestion classQues = entryList.stream().filter(m -> m.getClassid() == classid).findFirst().orElse(null);
                 if(classQues!= null){
-                    classMap.put("scorerate",classQues.getScorerate());
+                    if(classid == 0){
+                        classMap.put("scorerate",classQues.getSchoolavgrate());
+                    }else{
+                        classMap.put("scorerate",classQues.getScorerate());
+                    }
                 }else{
                     classMap.put("scorerate",0);
                 }
@@ -401,8 +405,12 @@ public class MsrClassQuestionService {
             }else{
                 //获取年级的
                 List<String> qnList = schoolQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
-                double sumScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
-                zsndMap.put("schoolscorerate", MarkingUtil.div(sumScoreRate,qnList.size()));
+                if(qnList.isEmpty()){
+                    zsndMap.put("schoolscorerate", 0);
+                }else{
+                    double sumScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                    zsndMap.put("schoolscorerate", MarkingUtil.div(sumScoreRate,qnList.size()));
+                }
             }
 
             //获取班级的情况
@@ -411,8 +419,12 @@ public class MsrClassQuestionService {
                 zsndMap.put("classscorerate", 0);
             }else{
                 List<String> qnList = schoolQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
-                double classScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
-                zsndMap.put("classscorerate",MarkingUtil.div(classScoreRate,qnList.size()));
+                if(qnList.isEmpty()){
+                    zsndMap.put("classscorerate", 0);
+                }else{
+                    double classScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                    zsndMap.put("classscorerate",MarkingUtil.div(classScoreRate,qnList.size()));
+                }
             }
 
             ndList.add(zsndMap);

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -15,7 +15,6 @@ import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.mapper.system.SchoolMapper;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
-import com.xhkjedu.smarking.model.paper.MsTemplate;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
@@ -25,6 +24,7 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.scan.ScanParams;
+import com.xhkjedu.smarking.vo.scan.TemplateVo;
 import com.xhkjedu.smarking.vo.stupaper.PaperStudentWebVo;
 import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
@@ -95,7 +95,7 @@ public class MsScanbatchPaperService {
     }
 
     //获取试卷的所有模版信息
-    public List<Map<String,Object>> listTemplates(Integer mpid){
+    public List<TemplateVo> listTemplates(Integer mpid){
         return msTemplateMapper.listTemplateBlockQueByMpid(mpid);
     }
 
@@ -675,7 +675,7 @@ public class MsScanbatchPaperService {
         if(scanbatchPapers.isEmpty()) return;
 
         //获取考试对应的试卷模板及坐标信息
-        List<Map<String,Object>> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
+        List<TemplateVo> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
         if(templates.isEmpty()) throw new ServiceException("该考试未设置试卷模板");
 
         //清空学生题块试题信息和学生试卷扫描识别信息
@@ -684,22 +684,23 @@ public class MsScanbatchPaperService {
         msScanbatchPaperMapper.deleteScanPaperForReidentify(param);
     }
 
-    private void chandleIdentifyPaper(List<MsScanbatchPaper> scanbatchPapers,List<MsTemplate> templates){
-        MsTemplate template = getPaperTemplate(scanbatchPapers,templates);//试卷模板
+    private void chandleIdentifyPaper(List<MsScanbatchPaper> scanbatchPapers,List<TemplateVo> templates){
+        TemplateVo template = getPaperTemplate(scanbatchPapers,templates);//试卷模板
         for(MsScanbatchPaper scanbatchPaper : scanbatchPapers){
 
+
         }
     }
-    //重新识别-试卷模板
-    private MsTemplate getPaperTemplate(List<MsScanbatchPaper> scanbatchPapers,List<MsTemplate> templates){
-        MsTemplate template = null;//试卷模板
+    //重新识别-获取试卷模板
+    private TemplateVo getPaperTemplate(List<MsScanbatchPaper> scanbatchPapers,List<TemplateVo> templates){
+        TemplateVo template = null;//试卷模板
         if(templates.size() == 1){
             template = templates.get(0);
         }else{
             MsScanbatchPaper firstPaper = scanbatchPapers.get(0);
             Integer maxWidth = firstPaper.getTwidth() + 30;
             Integer minWidth = firstPaper.getTwidth() - 30;
-            for(MsTemplate t : templates){
+            for(TemplateVo t : templates){
                 if(t.getTwidth() >= minWidth && t.getTwidth() <= maxWidth){
                     template = t;
                     break;
@@ -709,9 +710,9 @@ public class MsScanbatchPaperService {
         return template;
     }
 
-    //重新识别-获取试卷正反面图片
-    private void settPaperFrontAndBack(MsScanbatchPaper scanbatchPaper,MsTemplate template){
-
+    //重新识别-获取试卷正反面正确图片
+    private void settPaperFrontAndBack(MsScanbatchPaper scanbatchPaper,TemplateVo template){
+        String paperPic = scanbatchPaper.getPaperpic();
     }
 
 

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -412,7 +412,7 @@ public class MarkingUtil {
                 result += line;
             }
         } catch (Exception e) {
-            log.error("发送 POST 请求出现异常！" + e.getMessage());
+            log.error("发送 POST 请求出现异常：" + e.getMessage());
         }finally {
             try {
                 if(bufferedOutputStream!= null){
@@ -422,7 +422,7 @@ public class MarkingUtil {
                     bufferedReader.close();
                 }
             } catch (IOException ex) {
-                log.error("关闭输入输出流异常", ex.getMessage());
+                log.error("关闭输入输出流异常：" + ex.getMessage());
             }
         }
         return result;

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/TemplateBlockQuestionVo.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.smarking.vo.scan;
+
+import lombok.Data;
+
+/**
+ * @Description：模板题块试题
+ * @Author: WN
+ * @Date: 2025/1/13 10:04:22
+ **/
+@Data
+public class TemplateBlockQuestionVo {
+    //阅卷模板题块定客观题ID
+    private Integer mtbqid;
+    //题号
+    private String qn;
+    //试卷试题ID
+    private Integer mptqid;
+    //定位坐标
+    private String qlocalcoor;
+    //排序或首题题号
+    private Integer mtbqorder;
+}

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/TemplateBlockVo.java

@@ -0,0 +1,34 @@
+package com.xhkjedu.smarking.vo.scan;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：模板题块
+ * @Author: WN
+ * @Date: 2025/1/13 10:02:33
+ **/
+@Data
+public class TemplateBlockVo {
+    //阅卷模板题块定位区ID
+    private Integer mtbid;
+    //题块ID
+    private Integer mblockid;
+    //类型1客观题2主观题
+    private Integer mttype;
+    //客观题方向1横向2纵向
+    private Integer direct;
+    //排序/首题号
+    private Integer mtborder;
+    //定位区坐标
+    private String localcoor;
+    //主观题扩展区坐标列表
+    private String extendcoor;
+    //主观题打分区坐标
+    private String scorecoor;
+
+    //题块中试题
+    private List<TemplateBlockQuestionVo> tbquestions;
+
+}

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/TemplateVo.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.smarking.vo.scan;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：试卷模板
+ * @Author: WN
+ * @Date: 2025/1/13 10:00:24
+ **/
+@Data
+public class TemplateVo {
+    //阅卷扫描模板ID
+    private Integer mtid;
+    //试卷ID
+    private Integer mpid;
+    //模板尺寸1A4 2A3
+    private Integer tsize;
+    //纸张宽度(像素)
+    private Integer twidth;
+    //纸张高度(像素)
+    private Integer theight;
+    //正面图片
+    private String tfront;
+    //反面图片
+    private String tback;
+    //空白页索引
+    private Integer blankindex;
+    //定位正面旋转角度
+    private Integer anglefront;
+    //定位反面旋转角度
+    private Integer angleback;
+    //正面定位坐标
+    private String coorfront;
+    //反面定位坐标
+    private String coorback;
+    //正面定位图片地址
+    private String dwtfront;
+    //反面定位图片地址
+    private String dwtback;
+    //缺考标记坐标
+    private String misscoor;
+    //违规标记坐标
+    private String violatecoor;
+    //考号定位坐标
+    private String examnocoor;
+    //涂卡数字坐标列表
+    private String cardcoor;
+
+    //模板题块
+    private List<TemplateBlockVo> tblocks;
+}

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

@@ -51,12 +51,14 @@
     </select>
 
     <!--试卷所有模板信息-->
-    <resultMap id="paperTemplate" type="java.util.Map">
+    <resultMap id="paperTemplate" type="com.xhkjedu.smarking.vo.scan.TemplateVo">
         <result property="mtid" column="mtid"/>
         <result property="mpid" column="mpid"/>
         <result property="tsize" column="tsize"/>
         <result property="twidth" column="twidth"/>
         <result property="theight" column="theight"/>
+        <result property="tfront" column="tfront"/>
+        <result property="tback" column="tback"/>
         <result property="blankindex" column="blankindex"/>
         <result property="anglefront" column="anglefront"/>
         <result property="angleback" column="angleback"/>
@@ -68,7 +70,7 @@
         <result property="violatecoor" column="violatecoor"/>
         <result property="examnocoor" column="examnocoor"/>
         <result property="cardcoor" column="cardcoor"/>
-        <collection property="tblocks" ofType="java.util.Map" javaType="java.util.ArrayList">
+        <collection property="tblocks" ofType="com.xhkjedu.smarking.vo.scan.TemplateBlockVo" javaType="java.util.ArrayList">
             <result property="mtbid" column="mtbid"/>
             <result property="mblockid" column="mblockid"/>
             <result property="mttype" column="mttype"/>
@@ -76,7 +78,7 @@
             <result property="localcoor" column="localcoor"/>
             <result property="extendcoor" column="extendcoor"/>
             <result property="scorecoor" column="scorecoor"/>
-            <collection property="tbquestions" ofType="java.util.Map" javaType="java.util.ArrayList">
+            <collection property="tbquestions" ofType="com.xhkjedu.smarking.vo.scan.TemplateBlockQuestionVo" javaType="java.util.ArrayList">
                 <result property="mtbqid" column="mtbqid"/>
                 <result property="qn" column="qn"/>
                 <result property="mptqid" column="mptqid"/>
@@ -86,7 +88,7 @@
         </collection>
     </resultMap>
     <select id="listTemplateBlockQueByMpid" resultMap="paperTemplate">
-        select t.mtid,t.mpid,t.tsize,t.twidth,t.theight,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
+        select t.mtid,t.mpid,t.tsize,t.twidth,t.theight,t.tfront,t.tback,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
         t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
         ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.extendcoor,tb.scorecoor
         ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder

smarking/src/main/resources/mapper/report/reportclass/MsrClassQuestionMapper.xml

@@ -92,14 +92,13 @@
 
     <!--学科报告-各班学科试题分析-->
     <select id="listQuestionForXh" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion">
-        select q.cqid,q.mptqid,q.classid,q.qn,q.qtype,q.fullscore,
+        select distinct q.cqid,q.mptqid,q.classid,q.qn,q.qtype,q.qorder,q.fullscore,
         q.classavgrate,q.schoolavgrate,q.scorerate,q.scoreratec,q.nd,q.ndms,q.ndfw,q.qfd,q.qfdms,c.classname
         from msr_class_question q left join ms_class c on q.examid=c.examid
         and q.subjectid=c.subjectid and q.classid=c.classid
         where q.examid=#{param.examid} and q.subjectid=#{param.subjectid}
         <if test="param.selclass == 3">
-            and q.classid in
-            <foreach collection="param.classids" item="item" open="(" separator="," close=")">#{item}</foreach>
+            and q.classid in (${param.classids})
         </if>
         <if test="param.selclass == 4"> and q.classid = #{param.classid}</if>
         order by q.mptqid

smarking/src/main/resources/mapper/report/reportclass/MsrClassSubjectGradeMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectGradeMapper">
 
     <!--综合报告-试题汇总表-全部班级-科目情况-四率等级分析-->
-    <select id="listSubjectGrade" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade">
-        select * from msr_class_subject_grade where examid = #{sg.examid} and subjectid = #{sg.subjectId}
-        and reportcode = #{sg.reportCode} and classid = #{sg.classId}
+    <select id="listSubjectGrade" resultType="java.util.Map">
+        select csgid,rangename,rangenum,rangerate,djscore,djrate from msr_class_subject_grade where examid = #{sg.examid} and subjectid = #{sg.subjectid}
+        and reportcode = #{sg.reportcode} and classid = #{sg.classid}
     </select>
     <!--综合报告-班级对比-全科及格率分析-->
     <select id="listSubjectGradeForQk" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade">

smarking/src/main/resources/mapper/report/reportstu/MsrStudentMapper.xml

@@ -32,27 +32,25 @@
         <result property="totalscore" column="totalscore"/>
         <collection property="questions" ofType="java.util.Map" javaType="java.util.ArrayList">
             <result property="mpsqid" column="mpsqid"/>
-            <result property="qn" column="qn"/>
             <result property="stuscore" column="xtscore"/>
             <result property="answertype" column="answertype"/>
             <result property="stuanswer" column="stuanswer"/>
             <result property="qanswer" column="qanswer"/>
             <result property="qscore" column="qscore"/>
             <result property="qtype" column="qtype"/>
-            <result property="mptqn" column="mptqn"/>
+            <result property="qnstr" column="qnstr"/>
         </collection>
     </resultMap>
     <select id="listStuScoreAndRankByExamidAndSubjectid" resultMap="studentChengji">
         select distinct s.rsid,s.examid,s.subjectid,s.studentid,s.classid,c.classname,s.stuscore,s.classrank,
         s.schoolrank,s.objscore,s.subscore,sq.mpsqid,sq.qn,sq.stuscore as xtscore,sq.answertype,sq.stuanswer,
-        q.qanswer,q.qscore,q.qtype,qt.mptqn
+        q.qanswer,q.qscore,q.qtype,q.qnstr
         from msr_student s left join ms_class c on s.classid=c.classid
         left join ms_paper_student_question sq on s.examid=sq.examid
         and s.subjectid=sq.subjectid and s.studentid=sq.studentid
         left join ms_paper_qtype_question q on sq.mptqid=q.mptqid
-        left join ms_paper_qtype qt on q.mptid=qt.mptid
         where s.examid=#{examid} and s.subjectid=#{subjectid}
-        order by s.schoolrank,s.rsid,qt.mptorder,q.qorder
+        order by s.schoolrank,s.rsid,q.qorder
     </select>
 
     <!--学生报告-学生学科试题分析-->