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

sexam/src/main/java/com/xhkjedu/sexam/SexamApplication.java

@@ -3,11 +3,13 @@ package com.xhkjedu.sexam;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.scheduling.annotation.EnableAsync;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
 @EnableEurekaClient
 @MapperScan(basePackages = {"com.xhkjedu.sexam.mapper"})
+@EnableAsync
 public class SexamApplication {
 
     public static void main(String[] args) {

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectTeacherController.java

@@ -0,0 +1,143 @@
+package com.xhkjedu.sexam.controller.paper;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sexam.model.exam.ESubject;
+import com.xhkjedu.sexam.model.paper.EPaperCorrectquestion;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.service.paper.EPaperCorrectTeacherService;
+import com.xhkjedu.sexam.vo.paper.EPTeacherVo;
+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.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;
+
+/**
+ * @author ywx
+ * @classname EPaperCorrectTeacherController
+ * @description 教师阅卷
+ * @date 2022/7/27 11:24
+ **/
+@RestController
+@RequestMapping("/ept")
+public class EPaperCorrectTeacherController {
+    @Resource
+    private EPaperCorrectTeacherService correctTeacherService;
+
+    /**
+     * 待阅卷列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/27 14:07
+     **/
+    @PostMapping("/list_pending")
+    public ResultVo listPending(@RequestBody ESubject vo) {
+        Integer teacherid = vo.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1});
+        List<Map> list = correctTeacherService.listPending(teacherid);
+        return new ResultVo(0, "获取成功", list);
+    }
+
+    /**
+     * 已阅卷列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/27 14:18
+     **/
+    @PostMapping("/list_marked")
+    public ResultVo listMarked(@RequestBody ESubject vo) {
+        Integer teacherid = vo.getTeacherid();
+        Integer page = vo.getPage();
+        Integer pageSize = vo.getPageSize();
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = correctTeacherService.listMarked(teacherid);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
+    /**
+     * 随机获取待批试题
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/27 16:21
+     **/
+    @PostMapping("/get_cq")
+    public ResultVo getCorrectQuestion(@RequestBody EPTeacherVo vo) {
+        Integer epid = vo.getEpid();
+        Integer teacherid = vo.getTeacherid();
+        String qorders = vo.getQorders();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1, qorders, "页码", 2});
+        return correctTeacherService.getCorrectQuestion(epid, teacherid, qorders, vo.getClassids());
+    }
+
+    /**
+     * 获取上一份批阅试题
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/27 16:33
+     **/
+    @PostMapping("/get_pre")
+    public ResultVo getPreQuestion(@RequestBody EPTeacherVo vo) {
+        Integer epid = vo.getEpid();
+        Integer teacherid = vo.getTeacherid();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1});
+        return correctTeacherService.getPreQuestion(epid, teacherid);
+    }
+
+    /**
+     * 阅卷记录
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/27 16:41
+     **/
+    @PostMapping("/list_jl")
+    public ResultVo listRecord(@RequestBody EPaperCorrectquestion vo) {
+        Integer epid = vo.getEpid();
+        Integer teacherid = vo.getTeacherid();
+        Integer qorder = vo.getQorder();
+        Integer page = vo.getPage();
+        Integer pageSize = vo.getPageSize();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1, teacherid, "教师id", 1, qorder, "试题排序", 1
+                , page, "页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = correctTeacherService.listRecord(epid, teacherid, qorder);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
+    /**
+     * 批阅试题
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [vo]
+     * @Author ywx
+     * @Date 2022/7/28 15:30
+     **/
+    @PostMapping("/correct")
+    public ResultVo correctQuestion(@RequestBody EPaperStudentQuestion vo) {
+        Integer epsid = vo.getEpsid();
+        Integer epsqid = vo.getEpsqid();
+        Integer checkid = vo.getCheckid();
+        N_Utils.validation(new Object[]{epsid, "试卷学生id", 1, epsqid, "试卷学生试题id", 1, checkid, "批阅人", 1});
+        return correctTeacherService.correctQuestion(vo);
+    }
+}

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperCorrectTeacherMapper.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.sexam.mapper.paper;
+
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface EPaperCorrectTeacherMapper {
+    //待阅卷列表
+    List<Map> listPending(@Param("teacherid") Integer teacherid);
+
+    //已阅卷列表
+    List<Map> listMarked(@Param("teacherid") Integer teacherid);
+
+    //随机获取一条待批阅试题
+    EPaperSQuestionVo getCorrectQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid,
+                                         @Param("qorders") String qorders, @Param("classids") String classids);
+
+    //试题批阅情况
+    EPaperSQuestionVo getCheckQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid,
+                                       @Param("qorder") Integer qorder);
+
+    //修改试卷学生试题为批阅中
+    void updateCheckQuestionById(@Param("epsqid") Integer epsqid, @Param("teacherid") Integer teacherid);
+
+    //获取上一份批阅试题
+    Map getPreQuestion(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid);
+
+    //阅卷记录
+    List<Map> listRecord(@Param("epid") Integer epid, @Param("teacherid") Integer teacherid, @Param("qorder") Integer qorder);
+
+    //批阅试题
+    void correctQuestion(@Param("psq") EPaperStudentQuestion psq);
+
+    //学生未批改试题数量
+    Integer getNotCorrect(@Param("epsid") Integer epsid);
+
+    //修改学生试卷批阅状态
+    void updateCheckStuById(@Param("epsid") Integer epsid, @Param("checkid") Integer checkid);
+}

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperCorrectTeacherService.java

@@ -0,0 +1,89 @@
+package com.xhkjedu.sexam.service.paper;
+
+import com.xhkjedu.config.MissingParametersException;
+import com.xhkjedu.sexam.mapper.paper.EPaperCorrectTeacherMapper;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@Service
+@Slf4j
+public class EPaperCorrectTeacherService {
+    //ReentrantLock(boolean) true为公平锁，默认false不公平锁，性能更好，可以插队！
+    Lock lock = new ReentrantLock();
+    @Resource
+    private EPaperCorrectTeacherMapper correctTeacherMapper;
+
+    //待阅卷列表
+    public List<Map> listPending(Integer teacherid) {
+        return correctTeacherMapper.listPending(teacherid);
+    }
+
+    //已阅卷列表
+    public List<Map> listMarked(Integer teacherid) {
+        return correctTeacherMapper.listMarked(teacherid);
+    }
+
+    //随机获取待批试题
+    public ResultVo getCorrectQuestion(Integer epid, Integer teacherid, String qorders, String classids) {
+        lock.lock();
+        Map map = new HashMap();
+        try {
+            //随机获取一条待批阅试题
+            EPaperSQuestionVo sq = correctTeacherMapper.getCorrectQuestion(epid, teacherid, qorders, classids);
+            if (sq == null) return new ResultVo(1, "已批阅完成");
+            //修改试卷学生试题为批阅中
+            correctTeacherMapper.updateCheckQuestionById(sq.getEpsqid(), teacherid);
+            //试题批阅情况
+            EPaperSQuestionVo q = correctTeacherMapper.getCheckQuestion(epid, teacherid, sq.getQorder());
+            Integer tjnum = q.getTjnum();
+            Integer pynum = q.getPynum();
+            map.put("sq", sq);//学生待批试题
+            map.put("tjnum", tjnum);//提交人数
+            map.put("pynum", pynum);//批阅人数
+            map.put("wpynum", q.getWpynum());//我批阅人数
+            map.put("pyrate", N_Utils.getIntegerDivideAndMulitiply(pynum, tjnum));//批阅进度
+        } catch (Exception e) {
+            log.error("随机获取待批试题出错", e.getMessage());
+            throw new MissingParametersException("随机获取待批试题出错:" + e.getMessage());
+        } finally {
+            lock.unlock();
+        }
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    //获取上一份批阅试题
+    public ResultVo getPreQuestion(Integer epid, Integer teacherid) {
+        Map q = correctTeacherMapper.getPreQuestion(epid, teacherid);
+        if (q == null) return new ResultVo(1, "您还没有批阅记录");
+        return new ResultVo(0, "获取成功", q);
+    }
+
+    //阅卷记录
+    public List<Map> listRecord(Integer epid, Integer teacherid, Integer qorder) {
+        return correctTeacherMapper.listRecord(epid, teacherid, qorder);
+    }
+
+    //批阅试题
+    @Async("asyncPoolTaskExecutor")
+    public ResultVo correctQuestion(EPaperStudentQuestion psq) {
+        correctTeacherMapper.correctQuestion(psq);
+        Integer epsid = psq.getEpsid();
+        Integer num = correctTeacherMapper.getNotCorrect(epsid);//学生未批改试题数量
+        if (num == 0) {//批阅完成修改学生试卷批阅状态
+            correctTeacherMapper.updateCheckStuById(epsid, psq.getCheckid());
+        }
+        return new ResultVo(0, "批阅成功");
+    }
+}

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPTeacherVo.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname EPTeacherVo
+ * @description 教师阅卷
+ * @date 2022/7/27 15:07
+ **/
+@Data
+public class EPTeacherVo {
+    //试卷id
+    private Integer epid;
+
+    //教师id
+    private Integer teacherid;
+
+    //试题排序
+    private String qorders;
+
+    //班级ids
+    private String classids;
+}

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperSQuestionVo.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.sexam.vo.paper;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname EPaperSQuestionVo
+ * @description 试卷学生试题
+ * @date 2022/7/27 15:58
+ **/
+@Data
+public class EPaperSQuestionVo {
+    private Integer epsid;//试卷学生id
+    private Integer epsqid;//试卷学生试题id
+    private String stuanswer;//学生答案
+    private String qn;//试题题号
+    private Integer qorder;//试题排序
+    private double qscore;//分值
+    private Integer tjnum;//提交人数
+    private Integer pynum;//批阅人数
+    private Integer wpynum;//我批阅人数
+}

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

@@ -0,0 +1,96 @@
+<?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.paper.EPaperCorrectTeacherMapper">
+    <!--待阅卷列表-->
+    <select id="listPending" resultType="java.util.Map">
+        select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
+        ,truncate(count(case when ps.sstate=2 and ps.checked=2 then ps.epsid else null end)*100/
+                  count(case when ps.sstate=2 then ps.epsid else null end),2)pgrate
+        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(pc.classid)classids
+        from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
+        left join e_paper_correctclass pc on p.epid = pc.epid
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15)
+        union
+        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
+        where pq.teacherid=#{teacherid})a left join e_subject es on a.esid = es.esid
+        left join e_base eb on es.examid = eb.examid
+        left join e_paper_student ps on a.epid=ps.epid
+        group by a.epid
+        having count(case when ps.checked!=2 then ps.epsid else null end)>0
+    </select>
+    <!--已阅卷列表-->
+    <select id="listMarked" resultType="java.util.Map">
+        select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
+        from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(pc.classid)classids
+        from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
+        left join e_paper_correctclass pc on p.epid = pc.epid
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15)
+        union
+        select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
+        where pq.teacherid=#{teacherid})a left join e_subject es on a.esid = es.esid
+        left join e_base eb on es.examid = eb.examid
+        left join e_paper_student ps on a.epid=ps.epid
+        group by a.epid
+        having count(case when ps.checked!=2 then ps.epsid else null end)=0
+    </select>
+    <!--随机获取一条待批阅试题-->
+    <select id="getCorrectQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
+        select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.epsid
+        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder in(${qorders})
+        and psq.answered=1 and (psq.checked=0 or (psq.checked=1 and psq.checkid=#{teacherid}))
+        <if test="classids!=null and classids!=''">
+            and psq.classid in(${classids})
+        </if>
+        order by psq.qorder,psq.checked desc rand() limit 1
+    </select>
+    <!--试题批阅情况-->
+    <select id="getCheckQuestion" resultType="com.xhkjedu.sexam.vo.paper.EPaperSQuestionVo">
+        select count(psq.epsqid)tjnum,count(case when psq.checked=1 then psq.epsqid else null end)pynum
+        ,count(case when psq.checked=1 and psq.checkid=#{teacherid} then psq.epsqid else null end)wpynum
+        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder} and psq.answered=1
+    </select>
+    <!--修改试卷学生试题为批阅中-->
+    <update id="updateCheckQuestionById">
+        update e_paper_student_question set checked=1,checkid=#{teacherid} where epsqid=#{epsqid}
+    </update>
+    <!--获取上一份批阅试题-->
+    <select id="getPreQuestion" resultType="java.util.Map">
+        select psq.epsqid,psq.stuanswer,psq.qn,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.epsid
+        from e_paper_student_question psq where psq.epid=#{epid} and psq.checked=1 and psq.checkid=#{teacherid}
+        order by psq.checktime desc limit 1
+    </select>
+    <!--阅卷记录-->
+    <select id="listRecord" resultType="java.util.Map">
+        select psq.epsqid,psq.stuanswer,psq.qorder,psq.qscore,psq.stuscore,psq.good,psq.bad,psq.checktime
+        from e_paper_student_question psq where psq.epid=#{epid} and psq.qorder=#{qorder}
+        and psq.checked=1 and psq.checkid=#{teacherid}
+        order by psq.checktime desc
+    </select>
+    <!--批阅试题-->
+    <update id="correctQuestion">
+        update e_paper_student_question
+        set stuscore=#{psq.stuscore},psq.checked=1
+        ,checkid=#{psq.checkid},checktime=unix_timestamp()
+        ,good=#{psq.good},bad=#{psq.bad}
+        <if test="psq.stuanswer!=null and psq.stuanswer!=''">
+            and stuanswer=#{psq.stuanswer}
+        </if>
+        where psq.epsqid=#{psq.epsqid}
+    </update>
+    <!--学生未批改试题数量-->
+    <select id="getNotCorrect" resultType="java.lang.Integer">
+        select count(*) from e_paper_student_question where epsid=#{epsid} and checked!=2
+    </select>
+    <!--修改学生试卷批阅状态-->
+    <update id="updateCheckStuById">
+        update e_paper_student ps set ps.checked=2,ps.checkid=#{checkid}
+        ,ps.stuscore=(select sum(psq.stuscore) from e_paper_student_question psq where psq.epsid=ps.epsid)
+        where ps.epsid=#{epsid}
+    </update>
+</mapper>