完善对接接口

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsPaperBlockController.java

@@ -48,7 +48,7 @@ public class MsPaperBlockController {
      **/
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsPaperParams params) {
-        N_Utils.validation(new Object[]{params.getMsid(), "考试科目id",1});
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id",1});
         if (params.getBlocks() == null || params.getBlocks().isEmpty()) {
             return new ResultVo(1, "题块不能为空！");
         }

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

@@ -43,7 +43,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
 
     //获取试卷ID及考试模式
-    PExamSubjectVo getPaperAndMxammodeByMsid(@Param("msid") Integer msid);
+    PExamSubjectVo getPaperAndMxammodeByMpid(@Param("mpid") Integer mpid);
 
     //根据考试id和科目id获取试卷信息
     MsPaper getPaperByExamIdAndSubjectId(@Param("examId") Integer examId, @Param("subjectId") String subjectId);

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

@@ -31,4 +31,7 @@ public interface MsTemplateMapper extends TkMapper<MsTemplate> {
 
     //试卷所有模板信息
     List<MsTemplate> listTemplateBlockQueByMpid(@Param("mpid") Integer mpid);
+
+    //获取模版详情和考试id
+    MsTemplate getTemplateAndExamidByMtid(@Param("mtid") Integer mtid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsTemplate.java

@@ -64,5 +64,7 @@ public class MsTemplate extends BaseBean {
     private List<MsTemplateBlock> tblocks;
     @Transient
     private Integer mttype;//类型1客观题2主观题
+    @Transient
+    private Integer examid;
 
 }

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectBadstudentService.java

@@ -48,7 +48,7 @@ public class MsSubjectBadstudentService {
     public void add(MsSubjectBadstudent msSubjectBadstudent){
         //获取学校对应区域码，
         SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(msSubjectBadstudent.getMpid());
-        String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/invigilate/";
+        String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/invigilate";
 
         String picpath = MarkingUtil.uploadBase64Img(msSubjectBadstudent.getPicpath(), 1, saveFloder);
         if(N_Utils.isNotEmpty(picpath)){

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperBlockService.java

@@ -63,7 +63,7 @@ public class MsPaperBlockService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public Integer save(MsPaperParams params){
-        PExamSubjectVo paper = msPaperMapper.getPaperAndMxammodeByMsid(params.getMsid());
+        PExamSubjectVo paper = msPaperMapper.getPaperAndMxammodeByMpid(params.getMpid());
         Integer mpid = paper.getMpid();
 
         Integer createid = params.getCreateid();

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -400,7 +400,7 @@ public class MsPaperQtypeService {
         if (imgs.get(0).contains("base64")) {// 说明上传的是base64图片
             // 获取试卷对应学校区域码,base64转为图片
             SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(mpid);
-            String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/paper/";
+            String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/paper";
             paperFileVo = MarkingUtil.uploadBatchBase64ImgPdf(imgs, saveFloder);
         }
 

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperService.java

@@ -138,7 +138,7 @@ public class MsPaperService {
             List<String> base64list = pfiles.stream().map(MsPaperFile::getFilepath).collect(Collectors.toList());
 
             SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(mpid);
-            String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/paper/";
+            String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/paper";
             paperFileVo = MarkingUtil.uploadBatchBase64ImgPdf(base64list, saveFloder);
         }
 

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsTemplateService.java

@@ -92,7 +92,7 @@ public class MsTemplateService {
         msTemplate.setBlankindex(-1);
 
         SchoolCloudVo school = schoolMapper.getSchoolCloudcode(msTemplate.getMpid());
-        String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper/";
+        String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper";
         String tfront = MarkingUtil.uploadBase64Img(msTemplate.getTfront(),1, savefloder);
         if(N_Utils.isNotEmpty(tfront)){
             msTemplate.setTfront(tfront);
@@ -128,7 +128,7 @@ public class MsTemplateService {
         //定位区选择
         if(msTemplate.getCurrstep() == 3){
             SchoolCloudVo school = schoolMapper.getSchoolCloudcode(msTemplate.getMpid());
-            String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper/";
+            String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/marking/paper";
             if(N_Utils.isNotEmpty(msTemplate.getDwtfront())){
                 //定位区正面图片
                 String dwtfront = MarkingUtil.uploadBase64Img(msTemplate.getDwtfront(),1, savefloder);
@@ -428,7 +428,7 @@ public class MsTemplateService {
      * @Return com.xhkjedu.smarking.model.paper.MsTemplate
      **/
     public MsTemplate getTemplateDetailByMtid(MsTemplate mt){
-        MsTemplate msTemplate = msTemplateMapper.selectByPrimaryKey(mt.getMtid());
+        MsTemplate msTemplate = msTemplateMapper.getTemplateAndExamidByMtid(mt.getMtid());
         msTemplate.setTblocks(msTemplateBlockMapper.listTemplateBlockQuestions(mt.getMtid(),mt.getMttype()));
         return msTemplate;
     }

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

@@ -177,7 +177,7 @@ public class MsScanbatchPaperService {
     private void savePaperBlockQuestions(MsScanbatchPaper msScanbatchPaper){
         //获取学校对应区域码，
         SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(msScanbatchPaper.getMpid());
-        String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/scan/";
+        String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/scan";
 
         String paperfront = MarkingUtil.uploadBase64Img(msScanbatchPaper.getPaperfront(),1,saveFloder);
         if(N_Utils.isNotEmpty(paperfront)){
@@ -632,4 +632,10 @@ public class MsScanbatchPaperService {
         msScanbatchPaperMapper.updateBatchScanPaperMspstate(list);
     }
 
+    public void reIdentifyPaper(Integer examid,String subjectid,Integer mpid) {
+        //获取考试对应的试卷模板及坐标信息
+        List<MsTemplate> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
+
+    }
+
 }

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -69,7 +69,8 @@
     </select>
     <!--获取考试下所有科目名称-->
     <select id="listSubjectNameByExamId" resultType="java.util.Map">
-        select subjectid,subjectname from ms_subject where examid=#{examid}
+        select distinct s.subjectid,s.subjectname,p.mpid from ms_subject s
+        left join ms_paper p on s.msid=p.msid where s.examid=#{examid} order by s.msid
     </select>
     <!--根据考试科目id获取阅卷状态-->
     <select id="getCheckStateByMsId" resultType="java.lang.Integer">

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

@@ -78,8 +78,8 @@
     </select>
 
     <!--获取试卷ID及考试模式-->
-    <select id="getPaperAndMxammodeByMsid" resultType="com.xhkjedu.smarking.vo.paper.PExamSubjectVo">
-        select p.mpid,e.exammode from ms_paper p left join ms_exam e on p.examid=e.examid where p.msid=#{msid}
+    <select id="getPaperAndMxammodeByMpid" resultType="com.xhkjedu.smarking.vo.paper.PExamSubjectVo">
+        select p.mpid,e.exammode from ms_paper p left join ms_exam e on p.examid=e.examid where p.mpid=#{mpid}
     </select>
     <!--根据考试id和科目id获取试卷信息-->
     <select id="getPaperByExamIdAndSubjectId" resultType="com.xhkjedu.smarking.model.paper.MsPaper">

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

@@ -2,11 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.paper.MsTemplateMapper">
 
-    <!--根据msid查询试卷模板列表-->
+    <!--根据mpid查询试卷模板列表-->
     <select id="listTemplatesByMpid" resultType="java.util.Map">
-        select t.mtid,t.mpid,t.currstep,t.tstate,t.createtime,t.tfront,t.tback,t.blankindex,t.anglefront,t.angleback from ms_template t
-        left join ms_paper p on t.mpid=p.mpid
-        where p.mpid=#{mpid} order by t.createtime desc
+        select t.mtid,t.mpid,t.currstep,t.tstate,t.createtime,t.tfront,t.tback,t.blankindex,t.anglefront,t.angleback
+        from ms_template t where t.mpid=#{mpid} order by t.createtime desc
     </select>
 
     <!--设置试卷模板信息-->
@@ -94,4 +93,9 @@
         left join ms_template_block_question q on tb.mtbid=q.mtbid
         where t.mpid=#{mpid} order by t.mtid,tb.mtborder,q.mtbqorder
     </select>
+
+    <!--获取模版详情和考试id-->
+    <select id="getTemplateAndExamidByMtid" resultType="com.xhkjedu.smarking.model.paper.MsTemplate">
+        select t.*,p.examid from ms_template t left join ms_paper p on t.mpid=p.mpid where t.mtid=#{mtid}
+    </select>
 </mapper>