Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -107,7 +107,7 @@ public class EBaseController {
                 return new ResultVo(1, e.getMessage());
             }
         }
-        eBaseService.setExam(subjects);
+        eBaseService.setExam(subjects, createid);
         
         noticeService.batchSave(noticeList, msgList, schoolid, createid, 2);
         return new ResultVo(0, "设置成功");

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.exam.ESubjectBadstudent;
 import com.xhkjedu.sexam.service.exam.ESubjectBadstudentService;
+import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
@@ -14,36 +15,53 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 @RestController
-@RequestMapping("/e_badstudent")
+@RequestMapping("/ebs")
 public class ESubjectBadstudentController {
     @Resource
     private ESubjectBadstudentService eSubjectBadstudentService;
 
+    /**
+     * 保存违规学生记录
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [badstudent]
+     * @Author ywx
+     * @Date 2022/8/17 10:50
+     **/
     @PostMapping("/add")
-    public ResultVo add(@RequestBody ESubjectBadstudent eSubjectBadstudent) {
-        eSubjectBadstudentService.save(eSubjectBadstudent);
-        return new ResultVo(0,"保存成功");
+    public ResultVo add(@RequestBody ESubjectBadstudent badstudent) {
+        N_Utils.validation(new Object[]{badstudent.getStudentid(), "学生id", 1, badstudent.getEsid(), "考试科目id", 1
+                , badstudent.getClassid(), "班级id", 1, badstudent.getExamid(), "考试id", 1
+                , badstudent.getBadtype(), "违规类型", 1
+        });
+        eSubjectBadstudentService.save(badstudent);
+        return new ResultVo(0, "保存成功");
     }
 
-    @PostMapping("/delete")
-    public ResultVo delete(@RequestBody ESubjectBadstudent eSubjectBadstudent) {
-        eSubjectBadstudentService.deleteById(eSubjectBadstudent.getId());
-        return new ResultVo(0,"删除成功");
-    }
-
-    @PostMapping("/update")
-    public ResultVo update(@RequestBody ESubjectBadstudent eSubjectBadstudent) {
-        eSubjectBadstudentService.update(eSubjectBadstudent);
-        return new ResultVo(0,"修改成功");
-    }
-
-    @PostMapping("/list")
-    public ResultVo list(@RequestBody ESubjectBadstudent eSubjectBadstudent) {
-        PageHelper.startPage(eSubjectBadstudent.getPage(), eSubjectBadstudent.getPageSize());
-        List<ESubjectBadstudent> list = eSubjectBadstudentService.listAll();
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"获取列表成功",pageResult);
+    /**
+     * 实时监控
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [badstudent]
+     * @Author ywx
+     * @Date 2022/8/17 11:44
+     **/
+    @PostMapping("/list_sjk")
+    public ResultVo listJk(@RequestBody ESubjectBadstudent badstudent) {
+        Integer examid = badstudent.getExamid();
+        Integer esid = badstudent.getEsid();
+        Integer classid = badstudent.getClassid();
+        Integer page = badstudent.getPage();
+        Integer pageSize = badstudent.getPageSize();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, page, "页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = eSubjectBadstudentService.listStu(esid, classid, badstudent.getCreatename());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        Map map = eSubjectBadstudentService.getJkDetail(examid, esid);
+        map.put("pageResult", pageResult);
+        return new ResultVo(0, "获取成功", map);
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -175,4 +175,19 @@ public class EPaperStudentController {
         }
     }
 
+    /**
+     * 学生进场
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eps]
+     * @Author ywx
+     * @Date 2022/8/17 11:49
+     **/
+    @PostMapping("/in")
+    public ResultVo inPaper(@RequestBody EPaperStudent eps) {
+        Integer epsid = eps.getEpsid();
+        N_Utils.validation(new Object[]{epsid, "学生试卷id", 1});
+        ePaperStudentService.updateSstate(epsid, 1);
+        return new ResultVo(0, "进场成功");
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EScanbatchController.java

@@ -111,4 +111,34 @@ public class EScanbatchController {
             return new ResultVo(0, "获取成功", pageResult);
         }
     }
+
+    /**
+     * 获取扫描答卷识别异常详情
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eps]
+     * @Author ywx
+     * @Date 2022/8/17 9:44
+     **/
+    @PostMapping("/edetail")
+    public ResultVo getScanErrorDetail(@RequestBody EPaperStudent eps) {
+        Integer epid = eps.getEpid();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1});
+        Map map = eScanbatchService.getScanErrorDetail(epid);
+        return new ResultVo(0, "获取详情成功", map);
+    }
+
+    /**
+     * 批量标记待处理的扫描异常为已处理
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [serrorids]
+     * @Author ywx
+     * @Date 2022/8/17 10:32
+     **/
+    @PostMapping("/bhe")
+    public ResultVo batchHandleError(@RequestBody List<Integer> serrorids) {
+        eScanbatchService.batchHandleError(serrorids);
+        return new ResultVo(0, "处理成功");
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectBadstudentMapper.java

@@ -2,6 +2,17 @@ package com.xhkjedu.sexam.mapper.exam;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.exam.ESubjectBadstudent;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface ESubjectBadstudentMapper extends TkMapper<ESubjectBadstudent> {
+    //试卷学生
+    List<Map> listStu(@Param("esid") Integer esid, @Param("classid") Integer classid, @Param("studentname") String studentname);
+
+    //试卷异常次数
+    Integer getErrNumByEsId(@Param("esid") Integer esid);
+
+    Map getPaperRate(@Param("esid") Integer esid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectMapper.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface ESubjectMapper extends TkMapper<ESubject> {
     //考试设置
-    void setExam(@Param("subjects") List<ESubject> subjects);
+    void setExam(@Param("subjects") List<ESubject> subjects, @Param("handleid") Integer handleid);
 
     //更新考试科目状态
     void updateExamSubjectState(@Param("esstate") Integer esstate, @Param("esid") Integer esid);

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -66,4 +66,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //搜索考试学生获取学生试卷id
     List<Map> getStuSubjectPaperByname(@Param("ps")EPaperStudent ps);
+
+    //修改学生试卷状态
+    void updateSstate(@Param("epsid") Integer epsid, @Param("sstate") Integer sstate);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EScanerrorMapper.java

@@ -2,8 +2,16 @@ package com.xhkjedu.sexam.mapper.paperstudent;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paperstudent.EScanerror;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface EScanerrorMapper extends TkMapper<EScanerror> {
+    //试卷扫描出错列表
+    List<EScanerror> listByBatchIds(@Param("batchids") String batchids);
+
+    //批量标记待处理的扫描异常为已处理
+    void batchHandleError(@Param("serrorids") List<Integer> serrorids);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EScanerror.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.List;
+import javax.persistence.Transient;
 
 /**
  * @Description: TODO 扫描出错信息
@@ -35,5 +35,12 @@ public class EScanerror extends BaseBean {
 
     //创建时间
     private Integer createtime;
+    
+    //状态0待处理1已处理
+    private Integer errorstate;
+
+    @Transient
+    //扫描批次名称
+    private String batchname;
 
 }

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

@@ -179,8 +179,8 @@ public class EBaseService {
     }
 
     //考试设置
-    public void setExam(List<ESubject> subjects) {
-        eSubjectMapper.setExam(subjects);
+    public void setExam(List<ESubject> subjects, Integer handleid) {
+        eSubjectMapper.setExam(subjects, handleid);
     }
 
     //发布考试

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

@@ -1,5 +1,7 @@
 package com.xhkjedu.sexam.service.exam;
 
+import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
+import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectBadstudentMapper;
 import com.xhkjedu.sexam.model.exam.ESubjectBadstudent;
 import com.xhkjedu.utils.N_Utils;
@@ -7,11 +9,16 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class ESubjectBadstudentService {
     @Resource
     private ESubjectBadstudentMapper eSubjectBadstudentMapper;
+    @Resource
+    private EBaseMapper eBaseMapper;
+    @Resource
+    private EClassMapper eClassMapper;
 
     //添加
     public void save(ESubjectBadstudent model) {
@@ -19,23 +26,20 @@ public class ESubjectBadstudentService {
         eSubjectBadstudentMapper.insertSelective(model);
     }
 
-    //删除
-    public Integer deleteById(Integer id) {
-        return eSubjectBadstudentMapper.deleteByPrimaryKey(id);
-    }
-
-    //修改
-    public Integer update(ESubjectBadstudent model) {
-        return eSubjectBadstudentMapper.updateByPrimaryKeySelective(model);
-    }
-
-    //获取详情
-    public ESubjectBadstudent findById(Integer id) {
-        return eSubjectBadstudentMapper.selectByPrimaryKey(id);
+    //试卷学生
+    public List<Map> listStu(Integer esid, Integer classid, String studentname) {
+        List<Map> students = eSubjectBadstudentMapper.listStu(esid, classid, studentname);
+        return students;
     }
 
-    //获取列表
-    public List <ESubjectBadstudent> listAll() {
-        return eSubjectBadstudentMapper.selectAll();
+    public Map getJkDetail(Integer examid, Integer esid) {
+        Map map = eBaseMapper.findById(examid);
+        List<Map> classes = eClassMapper.listByExamId(examid);
+        map.put("classes", classes);
+        Integer errnum = eSubjectBadstudentMapper.getErrNumByEsId(esid);//试卷异常次数
+        map.put("errnum", errnum);
+        Map rate = eSubjectBadstudentMapper.getPaperRate(esid);
+        map.putAll(rate);
+        return map;
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -616,4 +616,8 @@ public class EPaperStudentService {
         return ePaperStudentMapper.getStuSubjectPaperByname(ps);
     }
 
+    //修改学生试卷状态
+    public void updateSstate(Integer epsid, Integer sstate) {
+        ePaperStudentMapper.updateSstate(epsid, sstate);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java

@@ -5,15 +5,19 @@ import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EScanbatchMapper;
+import com.xhkjedu.sexam.mapper.paperstudent.EScanerrorMapper;
 import com.xhkjedu.sexam.model.paperstudent.EScanbatch;
+import com.xhkjedu.sexam.model.paperstudent.EScanerror;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: TODO
@@ -31,6 +35,8 @@ public class EScanbatchService {
 
     @Resource
     private EClassMapper eClassMapper;
+    @Resource
+    private EScanerrorMapper eScanerrorMapper;
 
     /**
      * @description: 保持扫描试卷批次信息
@@ -39,13 +45,13 @@ public class EScanbatchService {
      * @author: wn
      * @date: 2022/8/11/011 9:42
      **/
-    public Map saveScanBatch(EScanbatch eScanbatch){
+    public Map saveScanBatch(EScanbatch eScanbatch) {
         String batchname = eScanbatch.getDevice() + "-" + eScanbatch.getEpid() + "-";
         //获取数据库中该批次名的扫描批次数量
         Integer bnum = eScanbatchMapper.getBatchNameLikeNum(batchname);
-        if(bnum == null || bnum == 0){
+        if (bnum == null || bnum == 0) {
             bnum = 1;
-        }else{
+        } else {
             bnum++;
         }
         batchname = batchname + bnum;
@@ -144,4 +150,69 @@ public class EScanbatchService {
     public List<Map> listScanStu(Integer epid, Integer sstate, String username, Integer classid) {
         return eScanbatchMapper.listScanStu(epid, sstate, username, classid);
     }
+
+    //获取扫描答卷识别异常详情
+    public Map getScanErrorDetail(Integer epid) {
+        Map map = eScanbatchMapper.listByEpId(epid);
+        List<Map> scanbatches = eScanbatchMapper.listScanBatchPapers(epid);//试卷扫描批次信息
+        Map<Object, String> batchMap = scanbatches.stream().collect(Collectors.toMap(s -> s.get("batchid"), s -> s.get(
+                "batchname").toString()));
+        String batchids = scanbatches.stream().map(s -> s.get("batchid").toString()).collect(Collectors.joining(","));
+        List<EScanerror> scanerrors = eScanerrorMapper.listByBatchIds(batchids);//试卷扫描出错列表
+        scanerrors.forEach(e -> {
+            e.setBatchname(batchMap.get(e.getBatchid()));
+        });
+        List<EScanerror> smccList = new ArrayList<>();//扫描出错集合
+        List<EScanerror> khywList = new ArrayList<>();//考号有误集合
+        List<EScanerror> zbdxsList = new ArrayList<>();//找不到学生集合
+        List<EScanerror> qsList = new ArrayList<>();//缺少考号或试卷id集合
+        Map<Integer, List<EScanerror>> collect = scanerrors.stream().collect(Collectors.groupingBy(s -> s.getErrortype()));
+        for (Map.Entry<Integer, List<EScanerror>> entry : collect.entrySet()) {
+            List<EScanerror> list = entry.getValue();
+            Integer errortype = entry.getKey();
+            if (errortype == 1) {
+                smccList = list;
+            } else if (errortype == 2) {
+                khywList = list;
+            } else if (errortype == 3) {
+                zbdxsList = list;
+            } else {
+                qsList = list;
+            }
+        }
+        Map smcc = new HashMap();//扫描出错
+        List<EScanerror> dclList = smccList.stream().filter(s -> s.getErrorstate().equals(0)).collect(Collectors.toList());
+        List<EScanerror> yclList = smccList.stream().filter(s -> s.getErrorstate().equals(1)).collect(Collectors.toList());
+        smcc.put("num", dclList.size());
+        smcc.put("dclList", dclList);
+        smcc.put("yclList", yclList);
+        map.put("smcc", smcc);
+        Map khyw = new HashMap();//考号有误
+        dclList = khywList.stream().filter(s -> s.getErrorstate().equals(0)).collect(Collectors.toList());
+        yclList = khywList.stream().filter(s -> s.getErrorstate().equals(1)).collect(Collectors.toList());
+        khyw.put("num", dclList.size());
+        khyw.put("dclList", dclList);
+        khyw.put("yclList", yclList);
+        map.put("khyw", khyw);
+        Map zbdxs = new HashMap();//找不到学生
+        dclList = zbdxsList.stream().filter(s -> s.getErrorstate().equals(0)).collect(Collectors.toList());
+        yclList = zbdxsList.stream().filter(s -> s.getErrorstate().equals(1)).collect(Collectors.toList());
+        zbdxs.put("num", dclList.size());
+        zbdxs.put("dclList", dclList);
+        zbdxs.put("yclList", yclList);
+        map.put("zbdxs", zbdxs);
+        Map qs = new HashMap();//缺少考号或试卷id
+        dclList = qsList.stream().filter(s -> s.getErrorstate().equals(0)).collect(Collectors.toList());
+        yclList = qsList.stream().filter(s -> s.getErrorstate().equals(1)).collect(Collectors.toList());
+        qs.put("num", dclList.size());
+        qs.put("dclList", dclList);
+        qs.put("yclList", yclList);
+        map.put("qs", qs);
+        return map;
+    }
+
+    //批量标记待处理的扫描异常为已处理
+    public void batchHandleError(List<Integer> serrorids) {
+        eScanerrorMapper.batchHandleError(serrorids);
+    }
 }

sexam/src/main/resources/mapper/exam/ESubjectBadstudentMapper.xml

@@ -0,0 +1,28 @@
+<?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.sexam.mapper.exam.ESubjectBadstudentMapper">
+    <!--试卷学生-->
+    <select id="listStu" resultType="java.util.Map">
+        select es.classid,es.sstate,u.username
+        from e_paper_student es left join t_user u on es.studentid = u.userid
+        where es.esid=#{esid}
+        <if test="classid!=null and classid!=0">
+            and es.classid=#{classid}
+        </if>
+        <if test="studentname!=null and studentname!=''">
+            and u.username like '%${studentname}%'
+        </if>
+    </select>
+    <!--试卷异常次数-->
+    <select id="getErrNumByEsId" resultType="java.lang.Integer">
+        select count(*) from e_subject_badstudent where esid=#{esid}
+    </select>
+    <select id="getPaperRate" resultType="java.util.Map">
+        select count(*)examnum
+             ,count(case when sstate!=0 then epsid else null end)jcnum
+             ,count(case when sstate=0 then epsid else null end)wjcnum
+             ,count(case when sstate=2 then epsid else null end)tjcnum
+             ,truncate(count(case when sstate!=0 then epsid else null end)*100/count(*),2)jcrate
+        from e_paper_student where esid=#{esid}
+    </select>
+</mapper>

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -5,6 +5,7 @@
     <update id="setExam">
         <foreach collection="subjects" item="s" separator=";">
             update e_subject set sdate=#{s.sdate},begintime=#{s.begintime},endtime=#{s.endtime},teacherid=#{s.teacherid}
+            ,handleid=#{handleid},handletime=unix_timestamp()
             where examid=#{s.examid} and subjectid=#{s.subjectid}
         </foreach>
     </update>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -224,4 +224,8 @@
         and u.username like concat('%',#{ps.stuname,jdbcType=VARCHAR},'%')
         group by ps.studentid
     </select>
+    <!--修改学生试卷状态-->
+    <update id="updateSstate">
+        update e_paper_student set sstate=#{sstate} where epsid=#{epsid}
+    </update>
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EScanbatchMapper.xml

@@ -74,8 +74,9 @@
     </select>
     <!--试卷基础信息-->
     <select id="listByEpId" resultType="java.util.Map">
-        select ifnull(ep.scantronnum,1)scantronnum,eb.examname,eb.gradeid
+        select ifnull(ep.scantronnum,1)scantronnum,eb.examname,eb.gradeid,es.subjectname
         from e_paper ep left join e_base eb on ep.examid = eb.examid
+        left join e_subject es on ep.esid = es.esid
         where ep.epid=#{epid}
     </select>
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EScanerrorMapper.xml

@@ -0,0 +1,16 @@
+<?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.sexam.mapper.paperstudent.EScanerrorMapper">
+    <!--试卷扫描出错列表-->
+    <select id="listByBatchIds" resultType="com.xhkjedu.sexam.model.paperstudent.EScanerror">
+        select serrorid, batchid, errortype, pagenum, stupic, errorjson, createtime
+        from e_scanerror where batchid in (${batchids})
+    </select>
+    <!--批量标记待处理的扫描异常为已处理-->
+    <update id="batchHandleError">
+        update e_scanerror set errorstate=1 where serrorid in
+        <foreach collection="serrorids" item="serrorid" index="index" open="(" separator="," close=")">
+            ${serrorid}
+        </foreach>
+    </update>
+</mapper>