扫描

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

@@ -34,7 +34,7 @@ public class MsPaperBackController {
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsPaperBack msPaperBack) {
         msPaperBackService.add(msPaperBack);
-        return new ResultVo(0, "保存成功！");
+        return new ResultVo(0, "保存成功");
     }
 
     /**
@@ -52,6 +52,6 @@ public class MsPaperBackController {
         PageHelper.startPage(page, size);
         List<MsPaperBack> list = msPaperBackService.queryList(msPaperBack);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+        return new ResultVo(0, "查询成功", pageResult);
     }
 }

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

@@ -36,7 +36,7 @@ public class MsPaperBlockController {
     public ResultVo listPaperBlocks(@RequestBody MsPaper msPaper) {
         N_Utils.validation(new Object[]{msPaper.getMsid(), "考试科目id",1});
         List<MsPaperBlock> list = msPaperBlockService.listPaperBlockQuestions(msPaper.getMsid());
-        return new ResultVo(0, "查询成功！", list);
+        return new ResultVo(0, "查询成功", list);
     }
 
     /*
@@ -53,7 +53,7 @@ public class MsPaperBlockController {
             return new ResultVo(1, "题块不能为空！");
         }
         Integer mpid = msPaperBlockService.save(params);
-        return new ResultVo(0, "保存成功！", mpid);
+        return new ResultVo(0, "保存成功", mpid);
     }
 
 

smarking/src/main/java/com/xhkjedu/smarking/controller/scan/MsScanbatchController.java

@@ -3,15 +3,20 @@ package com.xhkjedu.smarking.controller.scan;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
+import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.service.scan.MsScanbatchService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷答题卡扫描批次表相关操作
@@ -19,7 +24,7 @@ import java.util.List;
  * @Date 2024-10-15
  */
 @RestController
-@RequestMapping("/msScanbatch")
+@RequestMapping("/mscan")
 public class MsScanbatchController {
     @Resource
     private MsScanbatchService msScanbatchService;
@@ -33,25 +38,41 @@ public class MsScanbatchController {
      **/
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsScanbatch msScanbatch) {
-        msScanbatchService.add(msScanbatch);
-        return new ResultVo(0, "保存成功！");
+        N_Utils.validation(new Object[]{msScanbatch.getMpid(), "试卷id", 1});
+        Map<String,Object> map = msScanbatchService.save(msScanbatch);
+        return new ResultVo(0, "保存成功", map);
     }
 
-    /**
-     * @Description 列表
+    /*
+     * @Description 批次下试卷
+     * @Date 2024/10/24 16:30:20
+     * @Author WN
      * @Param [msScanbatch]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+     * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsScanbatch msScanbatch) {
+    @PostMapping("/papers")
+    public ResultVo listPaperByBatchid(@RequestBody MsScanbatch msScanbatch) {
         Integer page = msScanbatch.getPage();
-        Integer size = msScanbatch.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsScanbatch> list = msScanbatchService.queryList(msScanbatch);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+        Integer pageSize = msScanbatch.getPageSize();
+        N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1,msScanbatch.getBatchid(), "批次id", 1});
+        PageHelper.startPage(page, pageSize);
+        List<MsScanbatchPaper> papers = msScanbatchService.listPaperByBatchid(msScanbatch.getBatchid());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(papers));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
+    /*
+     * @Description 扫描答卷
+     * @Date 2024/10/24 15:12:56
+     * @Author WN
+     * @Param [msScanbatch]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/scan_paper")
+    public ResultVo getExamScanPaper(@RequestBody MsScanbatch msScanbatch) {
+        Integer mpid = msScanbatch.getMpid();
+        N_Utils.validation(new Object[]{mpid, "试卷id", 1});
+        Map<String, Object> map = msScanbatchService.getExamPaperScanInfo(mpid);
+        return new ResultVo(0, "查询成功", map);
     }
 }

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

@@ -46,4 +46,7 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
     //根据考试id和科目id获取试卷信息
     MsPaper getPaperByExamIdAndSubjectId(@Param("examId") Integer examId, @Param("subjectId") String subjectId);
+
+    //根据试卷ID获取考试ID
+    Integer getExamidByMpid(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchMapper.java

@@ -2,6 +2,10 @@ package com.xhkjedu.smarking.mapper.scan;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷答题卡扫描批次表 Mapper 接口
@@ -9,4 +13,16 @@ import com.xhkjedu.smarking.model.scan.MsScanbatch;
  * @Date 2024-10-15
  */
 public interface MsScanbatchMapper extends TkMapper<MsScanbatch> {
+
+    //扫描答卷-考试试卷信息
+    Map<String, Object> getExamPaperScanInfo(@Param("mpid")Integer mpid);
+
+    //扫描答卷-扫描信息
+    List<Map<String,Object>> listScanBatchForPaper(@Param("mpid")Integer mpid);
+
+    //获取批次名称模糊数量
+    Integer getBatchNumByBatchname(@Param("batchname")String batchname);
+
+    //获取试卷所有扫描批次
+    List<Map<String,Object>> listScanBatchByMpidForSel(@Param("mpid")Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchPaperMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.scan;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 批阅扫描试卷表 Mapper 接口
@@ -9,4 +12,7 @@ import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
  * @Date 2024-10-15
  */
 public interface MsScanbatchPaperMapper extends TkMapper<MsScanbatchPaper> {
+
+    //获取批次下所有试卷
+    List<MsScanbatchPaper> listPaperByBatchid(@Param("batchid") Integer batchid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatch.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 阅卷答题卡扫描批次表
@@ -35,4 +36,8 @@ public class MsScanbatch extends BaseBean {
     private Integer createid;
     //创建时间
     private Integer createtime;
+
+    //扫描设备
+    @Transient
+    private String device;
 }

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

@@ -1,11 +1,18 @@
 package com.xhkjedu.smarking.service.scan;
 
+import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
+import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper;
+import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
+import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷答题卡扫描批次表 服务实现类
@@ -16,26 +23,79 @@ import java.util.List;
 public class MsScanbatchService {
     @Resource
     private MsScanbatchMapper msScanbatchMapper;
+    @Resource
+    private MsPaperMapper msPaperMapper;
+    @Resource
+    private MsScanbatchPaperMapper msScanbatchPaperMapper;
+    @Resource
+    private MsClassMapper msClassMapper;
 
     /**
-     * @Description 新增
+     * @Description 新增扫描批次
      * @Param [msScanbatch]
      * @Author auto
      * @Date 2024-10-15
      * @return void
      **/
-    public void add(MsScanbatch msScanbatch){
-        msScanbatchMapper.insert(msScanbatch);
+    public Map<String,Object> save(MsScanbatch msScanbatch){
+        String batchname = msScanbatch.getDevice() + "-" + msScanbatch.getMpid() + "-";
+        Integer batchnum = msScanbatchMapper.getBatchNumByBatchname(batchname);
+        if(!N_Utils.isTrueInteger(batchnum)){
+            batchnum = 1;
+        }else{
+            batchnum ++;
+        }
+        batchname += batchnum;
+        Integer examid = msPaperMapper.getExamidByMpid(msScanbatch.getMpid());
+        msScanbatch.setBatchname(batchname);
+        msScanbatch.setExamid(examid);
+        msScanbatch.setCreatetime(N_Utils.getSecondTimestamp());
+        msScanbatch.setBatchnum(0);
+        msScanbatch.setScannum(0);
+        msScanbatch.setUploadnum(0);
+        msScanbatch.setIdentifynum(0);
+        msScanbatchMapper.insertUseGeneratedKeys(msScanbatch);
+
+        Map<String,Object> map = new HashMap<>();
+        map.put("batchname",batchname);
+        map.put("batchid",msScanbatch.getId());
+        return map;
     }
 
-    /**
-     * @Description 列表
-     * @Param [msScanbatch]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.scan.MsScanbatch>
+    /*
+     * @Description 获取批次下所有试卷
+     * @Date 2024/10/24 16:25:47
+     * @Author WN
+     * @Param [batchid]
+     * @Return java.util.List<com.xhkjedu.smarking.model.scan.MsScanbatchPaper>
      **/
-    public List<MsScanbatch> queryList(MsScanbatch msScanbatch){
-        return msScanbatchMapper.selectAll();
+    public List<MsScanbatchPaper> listPaperByBatchid(Integer batchid){
+        return msScanbatchPaperMapper.listPaperByBatchid(batchid);
     }
+
+    /*
+     * @Description 扫描答题卡
+     * @Date 2024/10/24 15:09:33
+     * @Author WN
+     * @Param [mpid]
+     * @Return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    public Map<String,Object> getExamPaperScanInfo(Integer mpid){
+        Map<String,Object> map = msScanbatchMapper.getExamPaperScanInfo(mpid);
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("paper",map);
+        rtnMap.put("scans",msScanbatchMapper.listScanBatchForPaper(mpid));
+        return rtnMap;
+    }
+
+    public Map<String,Object> getScanRecordAndClass(Integer mpid){
+        Map<String,Object> map = null;
+
+        //试卷扫描批次集合
+        List<Map<String,Object>> scans = msScanbatchMapper.listScanBatchByMpidForSel(mpid);
+        //参加考试的班级
+
+        return map;
+    }
+
 }

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

@@ -86,4 +86,8 @@
         from ms_paper where examid=#{examid} and subjectid=#{subjectid}
     </select>
 
+    <!--根据试卷ID获取考试ID-->
+    <select id="getExamidByMpid" resultType="java.lang.Integer">
+        select examid from ms_paper where mpid=#{mpid}
+    </select>
 </mapper>

smarking/src/main/resources/mapper/scan/MsScanbatchMapper.xml

@@ -1,4 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper">
+
+    <!--扫描答卷-考试试卷信息-->
+    <select id="getExamPaperScanInfo" resultType="java.util.Map">
+        select e.examid,e.examname,e.exammode,e.gradeid,s.msid,s.subjectid,s.subjectname,p.mpid,
+        (select sum(bqnum) from ms_paper_block where mpid=p.mpid and blocktype=1) objnum,
+        (select sum(bqnum) from ms_paper_block where mpid=p.mpid and blocktype=2) subnum,
+        (select count(mcsid) from ms_class_student where examid=e.examid and subjectid=s.subjectid) stunum
+        from ms_subject s left join ms_exam e on s.examid=e.examid
+        left join ms_paper p on s.msid=p.msid where p.mpid=#{mpid}
+    </select>
+
+    <!--扫描答卷-扫描信息-->
+    <select id="listScanBatchForPaper" resultType="java.util.Map">
+        select s.* from ms_scanbatch s where s.mpid=#{mpid} order by s.batchid
+    </select>
+
+    <!--获取批次名称模糊数量-->
+    <select id="getBatchNumByBatchname" resultType="java.lang.Integer">
+        select count(*) from ms_scanbatch where batchname like concat(#{batchname,jdbcType=VARCHAR},'%')
+    </select>
+
+    <!--获取试卷所有扫描批次-->
+    <select id="listScanBatchByMpidForSel" resultType="java.util.Map">
+        select batchid,batchname from ms_scanbatch where mpid=#{mpid} order by batchid
+    </select>
+
 </mapper>

smarking/src/main/resources/mapper/scan/MsScanbatchPaperMapper.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper">
+    <!--获取批次下所有试卷-->
+    <select id="listPaperByBatchid" resultType="com.xhkjedu.smarking.model.scan.MsScanbatchPaper">
+        select * from ms_scanbatch_paper where batchid = #{batchid} order by mspid
+    </select>
 </mapper>