课堂模块

sclass/src/main/java/com/xhkjedu/sclass/config/ScheduledConfig.java

@@ -0,0 +1,34 @@
+package com.xhkjedu.sclass.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor;
+
+/**
+ * @author ywx
+ * @className ScheduledConfig
+ * @description @Scheduled 注解，是被一个叫做 ScheduledAnnotationBeanPostProcessor 的类所拦截的，
+ * 所以我们可以根据配置，决定是否创建这个 bean，如果没有这个 bean，@Scheduled 就不会被拦截，那么定时任务肯定不会执行了，
+ * 需要注意的是：这种方式，启动类上面的 @EnableScheduling 需要去掉。
+ * @date 2021/5/18 9:15
+ **/
+@Configuration
+public class ScheduledConfig {
+    @Conditional(ScheduledCondition.class)
+    @Bean
+    public ScheduledAnnotationBeanPostProcessor processor(){
+        return new ScheduledAnnotationBeanPostProcessor();
+    }
+}
+
+class ScheduledCondition implements Condition{
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return Boolean.valueOf(context.getEnvironment().getProperty("enable.scheduled"));
+    }
+}

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -1,15 +1,34 @@
 package com.xhkjedu.sclass.controller.classroom;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.sclass.model.classroom.TClassroom;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
 import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomSign;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
+import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
+import com.xhkjedu.sclass.service.classroom.ClassroomPaperService;
 import com.xhkjedu.sclass.service.classroom.ClassroomService;
+import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
+import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
+import com.xhkjedu.sclass.vo.classroom.RoomVo;
+import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
+import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
+import com.xhkjedu.sclass.vo.room.RoomPVo;
+import com.xhkjedu.sclass.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.sclass.vo.classroom.RoomVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,8 +36,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("room")
@@ -27,13 +48,246 @@ public class ClassroomController {
 
     @Resource
     private ClassroomService classroomService;
+    @Resource
+    private ClassroomPaperService classroomPaperService;
+
+    /**
+     * 保存课堂数据
+     *
+     * @return com.xhkjedu.sclass.vo.ResultVo
+     * @Param [params]
+     * @Author ywx
+     * @Date 2020/7/14 16:45
+     **/
+    @PostMapping("/saveclass")
+    public ResultVo saveClass(@RequestBody List<RoomPVo> rooms) {
+        ResultVo resultVo = new ResultVo();
+        resultVo.setCode(1);
+        try {
+            List<Long> savelst = new ArrayList<>();//用于更新课堂时间参与学生
+            List<Integer> classlst = new ArrayList<>();//用于更新班级课堂状态
+            for (RoomPVo r : rooms) {
+                savelst.add(r.getRoomid());
+                List<RoomParamVo> params = r.getParams();
+                for (RoomParamVo param : params) {
+                    String rtype = param.getRtype();
+                    String jsonstr = param.getJsonstr();
+                    N_Utils.validation(new Object[]{rtype, "请求类型", 2, jsonstr, "请求json", 2});
+                    if (rtype.equals("startclass")) {//课堂--开始
+                        TClassroom room = JSON.parseObject(jsonstr, TClassroom.class);
+                        classlst.add(room.getClassid());
+                        boolean rtn = classroomService.startClass(room);//课堂是否重复请求
+                        if (rtn) {
+                            break;//课堂重复请求结束循环，执行下个课堂数据
+                        }
+                    } else if (rtype.equals("stopclass")) {//课堂--结束
+                        TClassroom room = JSON.parseObject(jsonstr, TClassroom.class);
+                        classroomService.stopClass(room);
+                    } else if (rtype.equals("savefile")) {//课堂--保存图片
+                        TClassroomFile file = JSON.parseObject(jsonstr, TClassroomFile.class);
+                        classroomService.saveFile(file);
+                    } else if (rtype.equals("askteacher")) {//互动--发起
+                        TClassroomAskteacher teacher = JSON.parseObject(jsonstr, TClassroomAskteacher.class);
+                        classroomService.saveWork(teacher);
+                    } else if (rtype.equals("askstudent")) {//互动--保存学生作答情况
+                        TClassroomAskstudent student = JSON.parseObject(jsonstr, TClassroomAskstudent.class);
+                        classroomService.saveStuAnswer(student);
+                    } else if (rtype.equals("sign")) {//学生--签到
+                        TClassroomSign sign = JSON.parseObject(jsonstr, TClassroomSign.class);
+                        classroomService.saveStudentSign(sign);
+                    } else if (rtype.equals("paper")) {//堂测--发布
+                        TClassroomPaper paper = JSON.parseObject(jsonstr, TClassroomPaper.class);
+                        classroomPaperService.saveScantronPaper(paper);
+                    } else if (rtype.equals("stupaper")) {//堂测--学生作答详情
+                        TClassroomPaperStudent student = JSON.parseObject(jsonstr, TClassroomPaperStudent.class);
+                        classroomPaperService.saveStudentScantron(student);
+                    }
+                }
+            }
+
+            //最后更新课堂中实际上课学生数量
+            classroomService.updateBatchRoomRealStunum(savelst);
+
+            List<Integer> distinctclass = classlst.stream().distinct().collect(Collectors.toList());
+            //结束班级
+            classroomService.updateBatchRoomState(distinctclass);
+            resultVo.setCode(0);
+            resultVo.setMsg("保存成功");
+        } catch (Exception e) {
+            log.error("保存课堂数据失败：" + e.getMessage());
+            resultVo.setMsg("保存失败");
+        }
+        return resultVo;
+    }
+
+    @PostMapping("/list_correct")
+    public ResultVo listCorrect(@RequestBody RoomVo room) {
+        Long roomid = room.getRoomid();
+        N_Utils.validation(new Object[]{roomid, "课堂id", 1});
+        RoomCorrectVo correct = classroomService.listCorrect(roomid);
+        return new ResultVo(0, "获取批阅信息成功", correct);
+    }
+
+    @PostMapping("/check_students_call")
+    public ResultVo listStudentsByAskTid(@RequestBody RoomCorrectCallVo call) {
+        Long asktid = call.getAsktid();
+        N_Utils.validation(new Object[]{asktid, "互动id", 1});
+        CheckClassVo checkVo = classroomService.listStudentsByAskTid(asktid);
+        return new ResultVo(0, "获取提问批改学生列表成功", checkVo);
+    }
+
+    @PostMapping("/check_students_exam")
+    public ResultVo listStudentsByPaperId(@RequestBody RoomCorrectExamVo exam) {
+        Long paperid = exam.getPaperid();
+        N_Utils.validation(new Object[]{paperid, "考试id", 1});
+        CheckClassVo checkVo = classroomService.listStudentsByPaperId(paperid);
+        return new ResultVo(0, "获取考试批改学生列表成功", checkVo);
+    }
+
+    @PostMapping("call_objective")
+    public ResultVo callObjective(@RequestBody RoomCorrectCallVo call) {
+        try {
+            Long asktid = call.getAsktid();
+            N_Utils.validation(new Object[]{asktid, "互动id", 1});
+            ObjectiveVo objective = classroomService.callObjective(asktid, call.getRealstunum());
+            return new ResultVo(0, "获取课堂提问客观题详情成功", objective);
+        } catch (Exception e) {
+            log.error("获取课堂提问客观题详情失败：" + e.getMessage());
+            return new ResultVo(1, "获取课堂提问客观题详情失败");
+        }
+    }
+
+    @PostMapping("exam_objective")
+    public ResultVo examObjective(@RequestBody ReportEQuestionVo question) {
+        try {
+            Long pscaid = question.getPscaid();
+            N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
+            ObjectiveVo objective = classroomService.examObjective(pscaid, question.getRealstunum());
+            return new ResultVo(0, "获取课堂考试客观题详情成功", objective);
+        } catch (Exception e) {
+            log.error("获取课堂考试客观题详情失败：" + e.getMessage());
+            return new ResultVo(1, "获取课堂考试客观题详情失败");
+        }
+    }
+
+    @PostMapping("call_subjective")
+    public ResultVo callSubjective(@RequestBody RoomCorrectCallVo call) {
+        try {
+            Long asktid = call.getAsktid();
+            N_Utils.validation(new Object[]{asktid, "互动id", 1});
+            SubjectiveVo subjective = classroomService.callSubjective(asktid, call.getRealstunum());
+            return new ResultVo(0, "获取课堂提问主观题详情成功", subjective);
+        } catch (Exception e) {
+            log.error("获取课堂提问客观题详情失败：" + e.getMessage());
+            return new ResultVo(1, "获取课堂提问主观题详情失败");
+        }
+    }
+
+    @PostMapping("exam_subjective")
+    public ResultVo examSubjective(@RequestBody ReportEQuestionVo question) {
+        try {
+            Long pscaid = question.getPscaid();
+            N_Utils.validation(new Object[]{pscaid, "答题卡id", 1});
+            SubjectiveVo subjective = classroomService.examSubjective(pscaid, question.getRealstunum());
+            return new ResultVo(0, "获取课堂考试主观题详情成功", subjective);
+        } catch (Exception e) {
+            log.error("获取课堂考试客观题详情失败：" + e.getMessage());
+            return new ResultVo(1, "获取课堂考试主观题详情失败");
+        }
+    }
+
+    @PostMapping("/correct_call")
+    public ResultVo correctCall(@RequestBody StudentVo student) {
+        Integer psid = student.getPsid();
+        Integer pschecked = student.getPschecked();
+        N_Utils.validation(new Object[]{psid, "互动学生id", 1, pschecked, "批改结果", 1});
+        classroomService.correctCall(psid, pschecked);
+        return new ResultVo(0, "批阅成功");
+    }
+
+    @PostMapping("/correct_exam")
+    public ResultVo correctExam(@RequestBody TPaperStudent ps) {
+        try {
+            Integer psid = ps.getPsid();
+            Integer checkid = ps.getCreateid();
+            String questionResult = ps.getQuestionResult();
+            N_Utils.validation(new Object[]{psid, "试卷学生id", 1, checkid, "批改人id", 1});
+            int result = classroomPaperService.correctExam(psid, checkid, questionResult);
+            if (result > 0) {
+                return new ResultVo(0, "批阅成功", 0);
+            } else {
+                return new ResultVo(0, "批阅完成", 1);
+            }
+        } catch (Exception e) {
+            return new ResultVo(1, "批阅失败");
+        }
+    }
+
+    @PostMapping("/list_correct_question")
+    public ResultVo listCorrectQuestion(@RequestBody TPaperStudent paperStudent) {
+        Integer psid = paperStudent.getPsid();
+        N_Utils.validation(new Object[]{psid, "考试学生id", 1});
+        //根据考试学生id获取考试是否完成批阅
+        /*Integer checked = roomPaperService.getCheckedByPsId(psid);
+        if (checked == 1){
+            return new ResultVo(1,"考试已结束批阅");
+        }*/
+        List<Map> paperQuestions = classroomPaperService.listCorrectQuestion(psid);
+        return new ResultVo(0, "获取考试学生待批改试题列表成功！", paperQuestions);
+    }
+
+    @PostMapping("/mark_call")
+    public ResultVo markCall(@RequestBody StudentVo student) {
+        Integer psid = student.getPsid();
+        String studentpic = student.getStudentpic();
+        N_Utils.validation(new Object[]{psid, "互动学生id", 1, studentpic, "批改结果", 1});
+        classroomService.updateStudentpic(psid, studentpic);
+        return new ResultVo(0, "保存成功");
+    }
+
+    @PostMapping("/mark_question")
+    public ResultVo markQuestion(@RequestBody TPaperStudentScantron ps) {
+        Integer pssid = ps.getPssid();
+        String useranswer = ps.getUseranswer();
+        N_Utils.validation(new Object[]{pssid, "考试学生试题id", 1, useranswer, "批改结果", 2});
+        classroomPaperService.updateScantronUseranswer(pssid, useranswer);
+        return new ResultVo(0, "保存成功");
+    }
+
+    @PostMapping("list_class_stu")
+    public ResultVo listStuClass(@RequestBody TClassroom room) {
+        try {
+            Integer studentid = room.getStudentid();
+            String subjectid = room.getSubjectid();
+            Integer page = room.getPage();
+            Integer pageSize = room.getPageSize();
+            N_Utils.validation(new Object[]{studentid, "学生id", 1, subjectid, "科目id", 2
+                    , page, "显示页码", 1, pageSize, "显示条数", 1});
+            PageHelper.startPage(page, pageSize);
+            List<RoomVo> list = classroomService.listStuClass(room);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取学生课堂回顾列表成功", pageResult);
+        } catch (Exception e) {
+            log.error("获取学生课堂回顾列表失败：" + e.getMessage());
+            return new ResultVo(1, "获取学生课堂回顾列表失败");
+        }
+    }
+
+    @PostMapping("/report_stu")
+    public ResultVo reportStu(@RequestBody TClassroom room) {
+        Long roomid = room.getRoomid();
+        Integer createid = room.getCreateid();
+        N_Utils.validation(new Object[]{roomid, "课堂id", 1, createid, "学生id", 1});
+        return classroomService.getReportStu(roomid, createid);
+    }
 
     /**
      * 获取课堂回顾列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [room]
      * @Author ywx
      * @Date 2020/6/15 10:57
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("list_class_directorid")
     public ResultVo listClassByDirectorId(@RequestBody TClassroom room) {
@@ -41,41 +295,42 @@ public class ClassroomController {
             Integer teacherid = room.getTeacherid();
             Integer page = room.getPage();
             Integer pageSize = room.getPageSize();
-            N_Utils.validation(new Object[]{teacherid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
+            N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
             PageHelper.startPage(page, pageSize);
             List<RoomVo> list = classroomService.listClassByDirectorId(room);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-            return new ResultVo(0,"获取课堂回顾列表成功",pageResult);
+            return new ResultVo(0, "获取课堂回顾列表成功", pageResult);
         } catch (Exception e) {
             log.error("获取课堂回顾列表失败：" + e.getMessage());
-            return new ResultVo(1,"获取课堂回顾列表失败");
+            return new ResultVo(1, "获取课堂回顾列表失败");
         }
     }
 
     /**
      * 课堂回顾详情
+     *
+     * @return com.xhkjedu.vo.ResultVo
      * @Param [room]
      * @Author ywx
      * @Date 2020/6/26 9:36
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/report")
     public ResultVo report(@RequestBody TClassroom room) {
-        N_Utils.validation(new Object[]{room.getRoomid(),"课堂id",1});
+        N_Utils.validation(new Object[]{room.getRoomid(), "课堂id", 1});
         return classroomService.getReport(room.getRoomid());
     }
 
     @PostMapping("/del_file")
     public ResultVo delFile(@RequestBody TClassroomFile file) {
-        N_Utils.validation(new Object[]{file.getRfid(),"课堂图片id",1});
+        N_Utils.validation(new Object[]{file.getRfid(), "课堂图片id", 1});
         classroomService.delFile(file.getRfid());
-        return new ResultVo(0,"删除成功");
+        return new ResultVo(0, "删除成功");
     }
 
     @PostMapping("/list_student")
     public ResultVo listStudent(@RequestBody TClassroom room) {
-        N_Utils.validation(new Object[]{room.getClassid(),"班级id",1,room.getLsbid(),"教材关联id",2});
+        N_Utils.validation(new Object[]{room.getClassid(), "班级id", 1, room.getLsbid(), "教材关联id", 2});
         List<Map> list = classroomService.listStudent(room.getClassid(), room.getLsbid());
-        return new ResultVo(0,"获取班级学生列表成功",list);
+        return new ResultVo(0, "获取班级学生列表成功", list);
     }
 }

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/RoomController.java

@@ -1,282 +0,0 @@
-package com.xhkjedu.sclass.controller.classroom;
-
-import com.alibaba.fastjson.JSON;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
-import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
-import com.xhkjedu.sclass.service.classroom.RoomPaperService;
-import com.xhkjedu.sclass.service.classroom.RoomService;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.RoomVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
-import com.xhkjedu.sclass.vo.paperstudent.StudentVo;
-import com.xhkjedu.sclass.vo.room.RoomPVo;
-import com.xhkjedu.sclass.vo.room.RoomParamVo;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-import com.xhkjedu.vo.ResultVo;
-import lombok.extern.slf4j.Slf4j;
-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.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("croom")
-@Slf4j
-public class RoomController {
-
-    @Resource
-    private RoomService roomService;
-    @Resource
-    private RoomPaperService roomPaperService;
-
-    /**
-     * 保存课堂数据
-     * @Param [params]
-     * @Author ywx
-     * @Date 2020/7/14 16:45
-     * @return com.xhkjedu.sclass.vo.ResultVo
-     **/
-    @PostMapping("/saveclass")
-    public ResultVo saveClass(@RequestBody List<RoomPVo> rooms) {
-        ResultVo resultVo = new ResultVo();
-        resultVo.setCode(1);
-        try {
-            List<Long> savelst = new ArrayList<>();//用于更新课堂时间参与学生
-            List<Integer> classlst = new ArrayList<>();//用于更新班级课堂状态
-            for (RoomPVo r : rooms) {
-                savelst.add(r.getRoomid());
-                List<RoomParamVo> params = r.getParams();
-                for (RoomParamVo param : params) {
-                    String rtype = param.getRtype();
-                    String jsonstr = param.getJsonstr();
-                    N_Utils.validation(new Object[]{rtype,"请求类型",2,jsonstr,"请求json",2});
-                    if (rtype.equals("startclass")){//课堂--开始
-                        TClassroom room = JSON.parseObject(jsonstr,TClassroom.class);
-                        classlst.add(room.getClassid());
-                        boolean rtn = roomService.startClass(room);//课堂是否重复请求
-                        if (rtn) {
-                            break;//课堂重复请求结束循环，执行下个课堂数据
-                        }
-                    } else if (rtype.equals("stopclass")){//课堂--结束
-                        TClassroom room = JSON.parseObject(jsonstr,TClassroom.class);
-                        roomService.stopClass(room);
-                    } else if (rtype.equals("savefile")){//课堂--保存图片
-                        TClassroomFile file = JSON.parseObject(jsonstr,TClassroomFile.class);
-                        roomService.saveFile(file);
-                    } else if (rtype.equals("askteacher")){//互动--发起
-                        TClassroomAskteacher teacher = JSON.parseObject(jsonstr,TClassroomAskteacher.class);
-                        roomService.saveWork(teacher);
-                    } else if (rtype.equals("askstudent")){//互动--保存学生作答情况
-                        TClassroomAskstudent student = JSON.parseObject(jsonstr,TClassroomAskstudent.class);
-                        roomService.saveStuAnswer(student);
-                    } else if (rtype.equals("sign")){//学生--签到
-                        TClassroomSign sign = JSON.parseObject(jsonstr,TClassroomSign.class);
-                        roomService.saveStudentSign(sign);
-                    } else if (rtype.equals("paper")){//堂测--发布
-                        TClassroomPaper paper = JSON.parseObject(jsonstr,TClassroomPaper.class);
-                        roomPaperService.saveScantronPaper(paper);
-                    } else if (rtype.equals("stupaper")){//堂测--学生作答详情
-                        TClassroomPaperStudent student = JSON.parseObject(jsonstr,TClassroomPaperStudent.class);
-                        roomPaperService.saveStudentScantron(student);
-                    }
-                }
-            }
-
-            //最后更新课堂中实际上课学生数量
-            roomService.updateBatchRoomRealStunum(savelst);
-
-            List<Integer> distinctclass = classlst.stream().distinct().collect(Collectors.toList());
-            //结束班级
-            roomService.updateBatchRoomState(distinctclass);
-            resultVo.setCode(0);
-            resultVo.setMsg("保存成功");
-        } catch (Exception e) {
-            log.error("保存课堂数据失败："+e.getMessage());
-            resultVo.setMsg("保存失败");
-        }
-        return resultVo;
-    }
-
-    @PostMapping("/list_correct")
-    public ResultVo listCorrect(@RequestBody RoomVo room) {
-        Long roomid = room.getRoomid();
-        N_Utils.validation(new Object[]{roomid,"课堂id",1});
-        RoomCorrectVo correct = roomService.listCorrect(roomid);
-        return new ResultVo(0,"获取批阅信息成功",correct);
-    }
-
-    @PostMapping("/check_students_call")
-    public ResultVo listStudentsByAskTid(@RequestBody RoomCorrectCallVo call) {
-        Long asktid = call.getAsktid();
-        N_Utils.validation(new Object[]{asktid,"互动id",1});
-        CheckClassVo checkVo = roomService.listStudentsByAskTid(asktid);
-        return new ResultVo(0,"获取提问批改学生列表成功",checkVo);
-    }
-
-    @PostMapping("/check_students_exam")
-    public ResultVo listStudentsByPaperId(@RequestBody RoomCorrectExamVo exam) {
-        Long paperid = exam.getPaperid();
-        N_Utils.validation(new Object[]{paperid,"考试id",1});
-        CheckClassVo checkVo = roomService.listStudentsByPaperId(paperid);
-        return new ResultVo(0,"获取考试批改学生列表成功",checkVo);
-    }
-
-    @PostMapping("call_objective")
-    public ResultVo callObjective(@RequestBody RoomCorrectCallVo call) {
-        try {
-            Long asktid = call.getAsktid();
-            N_Utils.validation(new Object[]{asktid,"互动id",1});
-            ObjectiveVo objective = roomService.callObjective(asktid, call.getRealstunum());
-            return new ResultVo(0,"获取课堂提问客观题详情成功",objective);
-        } catch (Exception e) {
-            log.error("获取课堂提问客观题详情失败：" + e.getMessage());
-            return new ResultVo(1,"获取课堂提问客观题详情失败");
-        }
-    }
-
-    @PostMapping("exam_objective")
-    public ResultVo examObjective(@RequestBody ReportEQuestionVo question) {
-        try {
-            Long pscaid = question.getPscaid();
-            N_Utils.validation(new Object[]{pscaid,"答题卡id",1});
-            ObjectiveVo objective = roomService.examObjective(pscaid, question.getRealstunum());
-            return new ResultVo(0,"获取课堂考试客观题详情成功",objective);
-        } catch (Exception e) {
-            log.error("获取课堂考试客观题详情失败：" + e.getMessage());
-            return new ResultVo(1,"获取课堂考试客观题详情失败");
-        }
-    }
-
-    @PostMapping("call_subjective")
-    public ResultVo callSubjective(@RequestBody RoomCorrectCallVo call) {
-        try {
-            Long asktid = call.getAsktid();
-            N_Utils.validation(new Object[]{asktid,"互动id",1});
-            SubjectiveVo subjective = roomService.callSubjective(asktid, call.getRealstunum());
-            return new ResultVo(0,"获取课堂提问主观题详情成功",subjective);
-        } catch (Exception e) {
-            log.error("获取课堂提问客观题详情失败：" + e.getMessage());
-            return new ResultVo(1,"获取课堂提问主观题详情失败");
-        }
-    }
-
-    @PostMapping("exam_subjective")
-    public ResultVo examSubjective(@RequestBody ReportEQuestionVo question) {
-        try {
-            Long pscaid = question.getPscaid();
-            N_Utils.validation(new Object[]{pscaid,"答题卡id",1});
-            SubjectiveVo subjective = roomService.examSubjective(pscaid, question.getRealstunum());
-            return new ResultVo(0,"获取课堂考试主观题详情成功",subjective);
-        } catch (Exception e) {
-            log.error("获取课堂考试客观题详情失败：" + e.getMessage());
-            return new ResultVo(1,"获取课堂考试主观题详情失败");
-        }
-    }
-
-    @PostMapping("/correct_call")
-    public ResultVo correctCall(@RequestBody StudentVo student) {
-        Integer psid = student.getPsid();
-        Integer pschecked = student.getPschecked();
-        N_Utils.validation(new Object[]{psid,"互动学生id",1,pschecked,"批改结果",1});
-        roomService.correctCall(psid, pschecked);
-        return new ResultVo(0,"批阅成功");
-    }
-
-    @PostMapping("/correct_exam")
-    public ResultVo correctExam(@RequestBody TPaperStudent ps) {
-        try {
-            Integer psid = ps.getPsid();
-            Integer checkid = ps.getCreateid();
-            String questionResult = ps.getQuestionResult();
-            N_Utils.validation(new Object[]{psid,"试卷学生id",1,checkid,"批改人id",1});
-            int result = roomPaperService.correctExam(psid, checkid, questionResult);
-            if (result > 0) {
-                return new ResultVo(0, "批阅成功",0);
-            } else {
-                return new ResultVo(0, "批阅完成",1);
-            }
-        } catch (Exception e) {
-            return new ResultVo(1,"批阅失败");
-        }
-    }
-
-    @PostMapping("/list_correct_question")
-    public ResultVo listCorrectQuestion(@RequestBody TPaperStudent paperStudent) {
-        Integer psid = paperStudent.getPsid();
-        N_Utils.validation(new Object[]{psid,"考试学生id",1});
-        //根据考试学生id获取考试是否完成批阅
-        /*Integer checked = roomPaperService.getCheckedByPsId(psid);
-        if (checked == 1){
-            return new ResultVo(1,"考试已结束批阅");
-        }*/
-        List<Map> paperQuestions = roomPaperService.listCorrectQuestion(psid);
-        return new ResultVo(0,"获取考试学生待批改试题列表成功！",paperQuestions);
-    }
-
-    @PostMapping("/mark_call")
-    public ResultVo markCall(@RequestBody StudentVo student) {
-        Integer psid = student.getPsid();
-        String studentpic = student.getStudentpic();
-        N_Utils.validation(new Object[]{psid,"互动学生id",1,studentpic,"批改结果",1});
-        roomService.updateStudentpic(psid, studentpic);
-        return new ResultVo(0,"保存成功");
-    }
-
-    @PostMapping("/mark_question")
-    public ResultVo markQuestion(@RequestBody TPaperStudentScantron ps) {
-        Integer pssid = ps.getPssid();
-        String useranswer = ps.getUseranswer();
-        N_Utils.validation(new Object[]{pssid,"考试学生试题id",1,useranswer,"批改结果",2});
-        roomPaperService.updateScantronUseranswer(pssid, useranswer);
-        return new ResultVo(0, "保存成功");
-    }
-
-    @PostMapping("list_class_stu")
-    public ResultVo listStuClass(@RequestBody TClassroom room) {
-        try {
-            Integer studentid = room.getStudentid();
-            String subjectid = room.getSubjectid();
-            Integer page = room.getPage();
-            Integer pageSize = room.getPageSize();
-            N_Utils.validation(new Object[]{studentid,"学生id",1,subjectid,"科目id",2
-                    ,page,"显示页码",1,pageSize,"显示条数",1});
-            PageHelper.startPage(page, pageSize);
-            List<RoomVo> list = roomService.listStuClass(room);
-            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-            return new ResultVo(0,"获取学生课堂回顾列表成功",pageResult);
-        } catch (Exception e) {
-            log.error("获取学生课堂回顾列表失败：" + e.getMessage());
-            return new ResultVo(1,"获取学生课堂回顾列表失败");
-        }
-    }
-
-    @PostMapping("/report_stu")
-    public ResultVo reportStu(@RequestBody TClassroom room) {
-        Long roomid = room.getRoomid();
-        Integer createid = room.getCreateid();
-        N_Utils.validation(new Object[]{roomid,"课堂id",1,createid,"学生id",1});
-        return roomService.getReportStu(roomid, createid);
-    }
-}

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomAskstudentMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomAskstudentMapper.java

@@ -1,16 +1,17 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
 import org.apache.ibatis.annotations.Param;
 
-public interface RoomAskstudentMapper extends TkMapper<TClassroomAskstudent> {
+public interface ClassroomAskstudentMapper extends TkMapper<TClassroomAskstudent> {
     /**
      * 保存学生作答情况
+     *
+     * @return java.lang.Integer
      * @Param [student]
      * @Author ywx
      * @Date 2020/7/14 14:04
-     * @return java.lang.Integer
      **/
     Integer save(@Param("r") TClassroomAskstudent student);
 

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomAskteacherMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomAskteacherMapper.java

@@ -1,16 +1,17 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
 import org.apache.ibatis.annotations.Param;
 
-public interface RoomAskteacherMapper extends TkMapper<TClassroomAskteacher> {
+public interface ClassroomAskteacherMapper extends TkMapper<TClassroomAskteacher> {
     /**
      * 保存教师互动信息
+     *
+     * @return java.lang.Integer
      * @Param [teacher]
      * @Author ywx
      * @Date 2020/7/14 14:10
-     * @return java.lang.Integer
      **/
     Integer save(@Param("r") TClassroomAskteacher teacher);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomFileMapper.java

@@ -2,6 +2,16 @@ package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import org.apache.ibatis.annotations.Param;
 
 public interface ClassroomFileMapper extends TkMapper<TClassroomFile> {
+    /**
+     * 保存课堂图片信息
+     *
+     * @return java.lang.Integer
+     * @Param [file]
+     * @Author ywx
+     * @Date 2020/7/14 13:57
+     **/
+    Integer save(@Param("r") TClassroomFile file);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomMapper.java

@@ -3,123 +3,257 @@ package com.xhkjedu.sclass.mapper.classroom;
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroom;
 import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
 import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
 import com.xhkjedu.sclass.vo.classroom.ReportExamVo;
 import com.xhkjedu.sclass.vo.classroom.ReportRoomVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
 import com.xhkjedu.sclass.vo.classroom.RoomVo;
+import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
 public interface ClassroomMapper extends TkMapper<TClassroom> {
+    /**
+     * 保存课堂
+     *
+     * @return java.lang.Integer
+     * @Param [r]
+     * @Author ywx
+     * @Date 2020/7/14 14:48
+     **/
+    Integer save(@Param("r") TClassroom room);
+
+    /**
+     * 获取班级学生id集合
+     *
+     * @return java.util.List<java.lang.Integer>
+     * @Param [roomid]
+     * @Author ywx
+     * @Date 2020/7/14 17:01
+     **/
+    List<Integer> listStudentId(@Param("roomid") Long roomid);
+
+    /**
+     * 获取批阅信息
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.RoomCorrectVo
+     * @Param [roomid]
+     * @Author ywx
+     * @Date 2020/9/9 15:38
+     **/
+    RoomCorrectVo listCorrect(Long roomid);
+
+    /**
+     * 获取提问批改学生列表
+     *
+     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/9 16:39
+     **/
+    CheckClassVo listStudentsByAskTid(Long asktid);
+
+    /**
+     * 获取考试批改学生列表
+     *
+     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
+     * @Param [paperid]
+     * @Author ywx
+     * @Date 2020/9/9 17:12
+     **/
+    CheckClassVo listStudentsByPaperId(Long paperid);
+
+    /**
+     * 获取课堂提问客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/10 11:12
+     **/
+    ObjectiveVo callObjective(Long asktid, Integer realstunum);
+
+    /**
+     * 获取课堂考试客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
+     * @Param [pscaid]
+     * @Author ywx
+     * @Date 2020/9/10 11:21
+     **/
+    ObjectiveVo examObjective(Long pscaid, Integer realstunum);
+
+    /**
+     * 获取课堂提问主客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/10 14:01
+     **/
+    SubjectiveVo callSubjective(Long asktid, Integer realstunum);
+
+    /**
+     * 获取课堂考试主客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
+     * @Param [pscaid]
+     * @Author ywx
+     * @Date 2020/9/10 14:24
+     **/
+    SubjectiveVo examSubjective(Long pscaid, Integer realstunum);
+
+    /**
+     * 课堂提问批阅
+     *
+     * @return void
+     * @Param [asksid, radiocorrect]
+     * @Author ywx
+     * @Date 2020/9/10 15:08
+     **/
+    void correctCall(Integer asksid, Integer radiocorrect);
+
+    /**
+     * 学生课堂回顾列表
+     *
+     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
+     * @Param [room]
+     * @Author ywx
+     * @Date 2020/9/14 16:32
+     **/
+    List<RoomVo> listStuClass(@Param("room") TClassroom room);
+
+    /**
+     * 学生课堂回顾详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.ReportRoomStuVo
+     * @Param [roomid, studentid]
+     * @Author ywx
+     * @Date 2020/9/14 16:57
+     **/
+    Map getReportStu(Long roomid, Integer studentid);
 
     /**
      * 结束课堂
+     *
+     * @return java.lang.Integer
      * @Param [room]
      * @Author ywx
      * @Date 2020/6/15 9:07
-     * @return java.lang.Integer
      **/
     Integer endClass(@Param("room") TClassroom room);
 
     /**
      * 获取教师指定章节下上过的课堂历史
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.RoomVo>
      * @Param [room]
      * @Author ywx
      * @Date 2020/6/15 9:18
-     * @return java.util.List<com.xhkjedu.vo.classroom.RoomVo>
      **/
     List<RoomVo> listClassByDirectorId(@Param("room") TClassroom room);
 
     /**
-     *功能描述  批量更新班级实际签到学生数量
+     * 功能描述  批量更新班级实际签到学生数量
+     *
+     * @param * @param roomidlist
+     * @return void
      * @author WN
      * @date 2020/8/14
-     * @param  * @param roomidlist
-     * @return void
      */
     void updateBatchRoomRealStunum(List<Long> roomidlist);
 
-
     /**
      * 根据班级id获取学生数量
+     *
+     * @return java.lang.Integer
      * @Param [classid]
      * @Author ywx
      * @Date 2020/6/15 9:08
-     * @return java.lang.Integer
      **/
     Integer getStudentNumById(@Param("classid") Integer classid);
 
     /**
      * 课堂回顾详情
+     *
+     * @return com.xhkjedu.vo.classroom.ReportRoomVo
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 9:36
-     * @return com.xhkjedu.vo.classroom.ReportRoomVo
      **/
     ReportRoomVo getReport(Long roomid);
 
     /**
      * 课堂提问列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.ReportQuestionVo>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 9:53
-     * @return java.util.List<com.xhkjedu.vo.classroom.ReportQuestionVo>
      **/
     List<Map> listQuestionReport(Long roomid);
 
     /**
      * 课堂点名列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.ReportStudentVo>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 10:06
-     * @return java.util.List<com.xhkjedu.vo.classroom.ReportStudentVo>
      **/
     List<Map> listCallReport(Long roomid);
 
     /**
      * 课堂抢答列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.ReportStudentVo>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 10:16
-     * @return java.util.List<com.xhkjedu.vo.classroom.ReportStudentVo>
      **/
     List<Map> listAskReport(Long roomid);
 
     /**
      * 课堂截图列表
+     *
+     * @return java.util.List<com.xhkjedu.model.classroom.TClassroomFile>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 10:24
-     * @return java.util.List<com.xhkjedu.model.classroom.TClassroomFile>
      **/
     List<TClassroomFile> listFileReport(Long roomid);
 
     /**
      * 课堂考试列表
-     * @Param [paperid,classid]
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.ReportEQuestionVo>
+     * @Param [paperid, classid]
      * @Author ywx
      * @Date 2020/6/26 10:34
-     * @return java.util.List<com.xhkjedu.vo.classroom.ReportEQuestionVo>
      **/
     List<ReportEQuestionVo> listExamReport(Long paperid, Integer classid);
 
     /**
-     *功能描述  批量结束之前班级的课堂状态
+     * 功能描述  批量结束之前班级的课堂状态
+     *
+     * @param * @param classidlist
+     * @return void
      * @author WN
      * @date 2020/8/14
-     * @param  * @param classidlist
-     * @return void
      */
     void updateBatchRoomState(List<Integer> classidlist);
 
     /**
      * 获取课堂考试列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.ReportExamVo>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/9/10 9:35
-     * @return java.util.List<com.xhkjedu.vo.classroom.ReportExamVo>
      **/
     List<ReportExamVo> listPaper(Long roomid);
 

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperFileMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperFileMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
@@ -11,7 +11,8 @@ import java.util.List;
  * @description
  * @date 2020/7/15 8:36
  **/
-public interface RoomPaperFileMapper extends TkMapper<TClassroomPaperFile> {
-    List<TClassroomPaperFile> listObjsByPaperid(Long paperid,Integer qctype);
+public interface ClassroomPaperFileMapper extends TkMapper<TClassroomPaperFile> {
+    List<TClassroomPaperFile> listObjsByPaperid(Long paperid, Integer qctype);
+
     List<String> listFilepath(Long paperid);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
@@ -6,8 +6,8 @@ import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
 /**
  * @author ywx
  * @classname RoomPaperMapper
- * @description 
+ * @description
  * @date 2020/7/15 8:18
  **/
-public interface RoomPaperMapper extends TkMapper<TClassroomPaper> {
+public interface ClassroomPaperMapper extends TkMapper<TClassroomPaper> {
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperQtypeMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperQtypeMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
@@ -9,16 +9,17 @@ import java.util.List;
 /**
  * @author ywx
  * @classname RoomPaperQtypeMapper
- * @description 
+ * @description
  * @date 2020/7/15 8:36
  **/
-public interface RoomPaperQtypeMapper extends TkMapper<TClassroomPaperQtype> {
+public interface ClassroomPaperQtypeMapper extends TkMapper<TClassroomPaperQtype> {
     /**
      * 保存答题卡题型
+     *
+     * @return java.lang.Integer
      * @Param [qtypes]
      * @Author ywx
      * @Date 2020/7/15 16:42
-     * @return java.lang.Integer
      **/
     Integer batchSave(@Param("list") List<TClassroomPaperQtype> qtypes);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperScantronMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperScantronMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperScantron;
@@ -8,16 +8,17 @@ import java.util.List;
 /**
  * @author ywx
  * @classname RoomPaperScantronMapper
- * @description 
+ * @description
  * @date 2020/7/15 8:36
  **/
-public interface RoomPaperScantronMapper extends TkMapper<TClassroomPaperScantron> {
+public interface ClassroomPaperScantronMapper extends TkMapper<TClassroomPaperScantron> {
     /**
      * 保存答题卡题型下试题
+     *
+     * @return java.lang.Integer
      * @Param [savescan]
      * @Author ywx
      * @Date 2020/7/15 16:46
-     * @return java.lang.Integer
      **/
     Integer batchSave(List<TClassroomPaperScantron> savescan);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperStudentMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperStudentMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
@@ -9,7 +9,7 @@ import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent;
  * @description
  * @date 2020/7/15 16:06
  **/
-public interface RoomPaperStudentMapper extends TkMapper<TClassroomPaperStudent> {
+public interface ClassroomPaperStudentMapper extends TkMapper<TClassroomPaperStudent> {
     //获取考试学生信息
     TClassroomPaperStudent findById(Integer psid);
 

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomPaperStudentScantronMapper.java → sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomPaperStudentScantronMapper.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sclass.mapper.room;
+package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.sclass.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperStudentScantron;
@@ -14,7 +14,7 @@ import java.util.Map;
  * @description
  * @date 2020/7/15 8:37
  **/
-public interface RoomPaperStudentScantronMapper extends TkMapper<TClassroomPaperStudentScantron> {
+public interface ClassroomPaperStudentScantronMapper extends TkMapper<TClassroomPaperStudentScantron> {
     //批量更新试题批改信息
     void updateScantronQuestionBatch(@Param("list") List<TPaperStudentScantron> psslist);
 

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomSignMapper.java

@@ -11,10 +11,21 @@ public interface ClassroomSignMapper extends TkMapper<TClassroomSign> {
 
     /**
      * 获取课堂学生列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.classroom.StudentSignVo>
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/9/8 10:19
-     * @return java.util.List<com.xhkjedu.vo.classroom.StudentSignVo>
      **/
     List<Map> listStudent(@Param("roomid") Long roomid);
+
+    /**
+     * 保存学生签到信息
+     *
+     * @return java.lang.Integer
+     * @Param [sign]
+     * @Author ywx
+     * @Date 2020/7/14 14:13
+     **/
+    Integer save(@Param("r") TClassroomSign sign);
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomFileMapper.java

@@ -1,16 +0,0 @@
-package com.xhkjedu.sclass.mapper.room;
-
-import com.xhkjedu.sclass.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import org.apache.ibatis.annotations.Param;
-
-public interface RoomFileMapper extends TkMapper<TClassroomFile> {
-    /**
-     * 保存课堂图片信息
-     * @Param [file]
-     * @Author ywx
-     * @Date 2020/7/14 13:57
-     * @return java.lang.Integer
-     **/
-    Integer save(@Param("r") TClassroomFile file);
-}

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomMapper.java

@@ -1,123 +0,0 @@
-package com.xhkjedu.sclass.mapper.room;
-
-import com.xhkjedu.sclass.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.RoomVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface RoomMapper extends TkMapper<TClassroom> {
-    /**
-     * 保存课堂
-     * @Param [r]
-     * @Author ywx
-     * @Date 2020/7/14 14:48
-     * @return java.lang.Integer
-     **/
-    Integer save(@Param("r") TClassroom room);
-
-    /**
-     * 获取班级学生id集合
-     * @Param [roomid]
-     * @Author ywx
-     * @Date 2020/7/14 17:01
-     * @return java.util.List<java.lang.Integer>
-     **/
-    List<Integer> listStudentId(@Param("roomid") Long roomid);
-
-    /**
-     * 获取批阅信息
-     * @Param [roomid]
-     * @Author ywx
-     * @Date 2020/9/9 15:38
-     * @return com.xhkjedu.sclass.vo.classroom.RoomCorrectVo
-     **/
-    RoomCorrectVo listCorrect(Long roomid);
-
-    /**
-     * 获取提问批改学生列表
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/9 16:39
-     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
-     **/
-    CheckClassVo listStudentsByAskTid(Long asktid);
-
-    /**
-     * 获取考试批改学生列表
-     * @Param [paperid]
-     * @Author ywx
-     * @Date 2020/9/9 17:12
-     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
-     **/
-    CheckClassVo listStudentsByPaperId(Long paperid);
-
-    /**
-     * 获取课堂提问客观题详情
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/10 11:12
-     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
-     **/
-    ObjectiveVo callObjective(Long asktid, Integer realstunum);
-
-    /**
-     * 获取课堂考试客观题详情
-     * @Param [pscaid]
-     * @Author ywx
-     * @Date 2020/9/10 11:21
-     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
-     **/
-    ObjectiveVo examObjective(Long pscaid, Integer realstunum);
-
-    /**
-     * 获取课堂提问主客观题详情
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/10 14:01
-     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
-     **/
-    SubjectiveVo callSubjective(Long asktid, Integer realstunum);
-
-    /**
-     * 获取课堂考试主客观题详情
-     * @Param [pscaid]
-     * @Author ywx
-     * @Date 2020/9/10 14:24
-     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
-     **/
-    SubjectiveVo examSubjective(Long pscaid, Integer realstunum);
-
-    /**
-     * 课堂提问批阅
-     * @Param [asksid, radiocorrect]
-     * @Author ywx
-     * @Date 2020/9/10 15:08
-     * @return void
-     **/
-    void correctCall(Integer asksid, Integer radiocorrect);
-
-    /**
-     * 学生课堂回顾列表
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/9/14 16:32
-     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
-     **/
-    List<RoomVo> listStuClass(@Param("room") TClassroom room);
-
-    /**
-     * 学生课堂回顾详情
-     * @Param [roomid, studentid]
-     * @Author ywx
-     * @Date 2020/9/14 16:57
-     * @return com.xhkjedu.sclass.vo.classroom.ReportRoomStuVo
-     **/
-    Map getReportStu(Long roomid, Integer studentid);
-}

sclass/src/main/java/com/xhkjedu/sclass/mapper/room/RoomSignMapper.java

@@ -1,16 +0,0 @@
-package com.xhkjedu.sclass.mapper.room;
-
-import com.xhkjedu.sclass.base.TkMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
-import org.apache.ibatis.annotations.Param;
-
-public interface RoomSignMapper extends TkMapper<TClassroomSign> {
-    /**
-     * 保存学生签到信息
-     * @Param [sign]
-     * @Author ywx
-     * @Date 2020/7/14 14:13
-     * @return java.lang.Integer
-     **/
-    Integer save(@Param("r") TClassroomSign sign);
-}

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/RoomPaperService.java → sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomPaperService.java

@@ -1,12 +1,12 @@
 package com.xhkjedu.sclass.service.classroom;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sclass.mapper.room.RoomPaperFileMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperQtypeMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperScantronMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperStudentMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperStudentScantronMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperQtypeMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperScantronMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentScantronMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaper;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
 import com.xhkjedu.sclass.model.classroom.TClassroomPaperQtype;
@@ -34,19 +34,19 @@ import java.util.stream.Collectors;
  **/
 @Slf4j
 @Service
-public class RoomPaperService {
+public class ClassroomPaperService {
     @Resource
-    private RoomPaperMapper roomPaperMapper;
+    private ClassroomPaperMapper classroomPaperMapper;
     @Resource
-    private RoomPaperFileMapper roomPaperFileMapper;
+    private ClassroomPaperFileMapper classroomPaperFileMapper;
     @Resource
-    private RoomPaperQtypeMapper roomPaperQtypeMapper;
+    private ClassroomPaperQtypeMapper classroomPaperQtypeMapper;
     @Resource
-    private RoomPaperScantronMapper roomPaperScantronMapper;
+    private ClassroomPaperScantronMapper classroomPaperScantronMapper;
     @Resource
-    private RoomPaperStudentMapper roomPaperStudentMapper;
+    private ClassroomPaperStudentMapper classroomPaperStudentMapper;
     @Resource
-    private RoomPaperStudentScantronMapper roomPaperStudentScantronMapper;
+    private ClassroomPaperStudentScantronMapper classroomPaperStudentScantronMapper;
 
     /**
      * 答题卡作业--保存
@@ -71,7 +71,7 @@ public class RoomPaperService {
             if (directorid != null && (directorid.equals("0") || directorid.equals(""))) {
                 paper.setDirectorid(null);
             }
-            roomPaperMapper.insertSelective(paper);//保存作业
+            classroomPaperMapper.insertSelective(paper);//保存作业
 
             //保存作业关联信息
             List<TClassroomPaperFile> lst = paper.getPfiles();
@@ -98,7 +98,7 @@ public class RoomPaperService {
             pf.setSchoolid(paper.getSchoolid());
             pf.setPaperid(paper.getPaperid());
         }
-        roomPaperFileMapper.insertList(lst);
+        classroomPaperFileMapper.insertList(lst);
     }
 
     //课堂考试--保存答题卡-题型-试题
@@ -131,9 +131,9 @@ public class RoomPaperService {
         }
 
         //保存答题卡题型
-        roomPaperQtypeMapper.batchSave(qtypes);
+        classroomPaperQtypeMapper.batchSave(qtypes);
         //保存答题卡题型下试题
-        roomPaperScantronMapper.batchSave(savescan);
+        classroomPaperScantronMapper.batchSave(savescan);
     }
 
     /**
@@ -146,7 +146,7 @@ public class RoomPaperService {
     @Transactional(rollbackFor = Exception.class)
     public void saveStudentScantron(TClassroomPaperStudent student) {
         try {
-            roomPaperStudentMapper.insertUseGeneratedKeys(student);
+            classroomPaperStudentMapper.insertUseGeneratedKeys(student);
             Integer psid = student.getId();
             List<TClassroomPaperStudentScantron> scantrons = student.getScantrons();
             int qorder = 1;//试题序号
@@ -155,7 +155,7 @@ public class RoomPaperService {
                 s.setQorder(qorder);
                 qorder++;
             }
-            roomPaperStudentScantronMapper.insertList(scantrons);
+            classroomPaperStudentScantronMapper.insertList(scantrons);
         } catch (Exception e) {
             log.error("保存学生作答详情失败："+e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -165,7 +165,7 @@ public class RoomPaperService {
     @Transactional(rollbackFor = Exception.class)
     public int correctExam(Integer psid, Integer checkid, String questionResult) throws Exception {
         try {
-            TClassroomPaperStudent ps = roomPaperStudentMapper.findById(psid);
+            TClassroomPaperStudent ps = classroomPaperStudentMapper.findById(psid);
             Long paperid = ps.getPaperid();
             Integer classid = ps.getClassid();
             List<TPaperStudentScantron> psslist = JSON.parseArray(questionResult, TPaperStudentScantron.class);
@@ -178,13 +178,13 @@ public class RoomPaperService {
                 }
 
                 //批量更新试题批改信息
-                roomPaperStudentScantronMapper.updateScantronQuestionBatch(psslist);
+                classroomPaperStudentScantronMapper.updateScantronQuestionBatch(psslist);
             }
             //更新用户得分
-            roomPaperStudentMapper.updateScantronStuScore(psid);
+            classroomPaperStudentMapper.updateScantronStuScore(psid);
             //判断该作业该班级时候已经批改完成
             //查询如果为0，则证明本作业本班级截止当前时间已经提交作业学生全部批改完成
-            Integer notCorrect = roomPaperStudentMapper.getNotCorrect(paperid, classid);
+            Integer notCorrect = classroomPaperStudentMapper.getNotCorrect(paperid, classid);
             return notCorrect;
         } catch (Exception e) {
             log.error("课堂考试批阅失败："+e.getMessage());
@@ -201,7 +201,7 @@ public class RoomPaperService {
      * @return java.lang.Integer
      **/
     public Integer getCheckedByPsId(Integer psid) {
-        return roomPaperStudentMapper.getCheckedByPsId(psid);
+        return classroomPaperStudentMapper.getCheckedByPsId(psid);
     }
 
     /**
@@ -212,7 +212,7 @@ public class RoomPaperService {
      * @return java.util.List<com.xhkjedu.vo.paperstudent.PaperStudentScantronVo>
      **/
     public List<Map> listCorrectQuestion(Integer psid) {
-        return roomPaperStudentScantronMapper.listCorrectQuestion(psid);
+        return classroomPaperStudentScantronMapper.listCorrectQuestion(psid);
     }
 
     /**
@@ -223,6 +223,6 @@ public class RoomPaperService {
      * @return void
      **/
     public void updateScantronUseranswer(Integer pssid, String useranswer) {
-        roomPaperStudentScantronMapper.updateScantronUseranswer(pssid, useranswer);
+        classroomPaperStudentScantronMapper.updateScantronUseranswer(pssid, useranswer);
     }
 }

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -1,19 +1,35 @@
 package com.xhkjedu.sclass.service.classroom;
 
+import com.xhkjedu.sclass.mapper.classroom.ClassroomActivestudentMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomAskstudentMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomAskteacherMapper;
 import com.xhkjedu.sclass.mapper.classroom.ClassroomFileMapper;
 import com.xhkjedu.sclass.mapper.classroom.ClassroomMapper;
+import com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper;
 import com.xhkjedu.sclass.mapper.classroom.ClassroomSignMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperFileMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroom;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
+import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
 import com.xhkjedu.sclass.model.classroom.TClassroomFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
+import com.xhkjedu.sclass.model.classroom.TClassroomSign;
+import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
 import com.xhkjedu.sclass.vo.classroom.ReportEQuestionVo;
 import com.xhkjedu.sclass.vo.classroom.ReportExamVo;
 import com.xhkjedu.sclass.vo.classroom.ReportRoomVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
+import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
 import com.xhkjedu.sclass.vo.classroom.RoomVo;
+import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
+import com.xhkjedu.sclass.vo.paper.CheckClassVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -22,21 +38,363 @@ import java.util.Map;
 @Slf4j
 @Service
 public class ClassroomService {
+    @Resource
+    private ClassroomAskteacherMapper classroomAskteacherMapper;
+    @Resource
+    private ClassroomActivestudentMapper classroomActivestudentMapper;
+    @Resource
+    private ClassroomAskstudentMapper classroomAskstudentMapper;
     @Resource
     private ClassroomMapper classroomMapper;
     @Resource
-    private ClassroomSignMapper classroomSignMapper;
+    private ClassroomPaperFileMapper classroomPaperFileMapper;
     @Resource
-    private RoomPaperFileMapper roomPaperFileMapper;
+    private ClassroomSignMapper classroomSignMapper;
     @Resource
     private ClassroomFileMapper classroomFileMapper;
 
+    /**
+     * 开始课堂
+     *
+     * @return void
+     * @Param [room]
+     * @Author ywx
+     * @Date 2020/7/14 17:17
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public boolean startClass(TClassroom room) {
+        boolean rtn = false;//课堂是否重复请求
+        try {
+            room.setRoomstate(1);
+            Integer num = classroomMapper.getStudentNumById(room.getClassid());//根据班级id获取学生数量
+            room.setClassnum(num);
+            classroomMapper.save(room);
+            classroomActivestudentMapper.saveStuActive(room.getRoomid(), room.getClassid(), room.getSchoolid());
+        } catch (Exception e) {
+            if (e instanceof DuplicateKeyException) {
+                rtn = true;
+                log.error("接口重复请求，课堂id：" + room.getRoomid() + ",课堂名称：" + room.getRoomname());
+            } else {
+                log.error("开始课堂失败：" + e.getMessage());
+            }
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return rtn;
+    }
+
+    /**
+     * 结束课堂
+     *
+     * @return void
+     * @Param [room]
+     * @Author ywx
+     * @Date 2020/7/14 17:17
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void stopClass(TClassroom room) {
+        try {
+            Long roomid = room.getRoomid();
+            if (N_Utils.isEmptyInteger(room.getEndtime())) {//异常结束：结束时间=开始时间+45分钟
+                TClassroom tClassroom = classroomMapper.selectByPrimaryKey(roomid);
+                room.setEndtime(tClassroom.getCreatetime() + 60 * 45);
+            }
+            classroomMapper.endClass(room);//结束课堂
+            classroomActivestudentMapper.updateActiveRank(roomid);//更新活跃值排名
+        } catch (Exception e) {
+            log.error("结束课堂失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+
+    /**
+     * 保存学生签到信息
+     *
+     * @return void
+     * @Param [sign]
+     * @Author ywx
+     * @Date 2020/7/14 16:32
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveStudentSign(TClassroomSign sign) {
+        try {
+            Long roomid = sign.getRoomid();
+            Integer userid = sign.getUserid();
+            List<Integer> studentids = classroomMapper.listStudentId(roomid);//获取班级学生id集合
+            if (N_Utils.numInList(userid, studentids)) {//签到学生是本课堂所在班级学生，添加签到信息
+                classroomSignMapper.save(sign);
+                //如果一个学生退出课堂再进来数据就不对了，最后计算
+                //classroomMapper.updateRealStuNum(sign.getRoomid());//更新班级实际签到学生数量
+                classroomActivestudentMapper.updateActiveNum(roomid, userid);//更新学生活跃值
+            }
+        } catch (Exception e) {
+            log.error("保存学生签到信息失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+
+    /**
+     * 功能描述 最后更新课堂名称
+     *
+     * @param * @param roomlist
+     * @return void
+     * @author WN
+     * @date 2020/8/14
+     */
+    public void updateBatchRoomRealStunum(List<Long> roomlist) {
+        classroomMapper.updateBatchRoomRealStunum(roomlist);
+    }
+
+    /**
+     * 互动发起
+     *
+     * @return void
+     * @Param [teacher]
+     * @Author ywx
+     * @Date 2020/6/15 9:58
+     **/
+    public void saveWork(TClassroomAskteacher teacher) {
+        try {
+            if (teacher.getPaperid() == null) {
+                teacher.setPaperid(0L);
+            }
+            if (teacher.getRadionum() == null) {
+                teacher.setRadionum(0);
+            }
+            classroomAskteacherMapper.save(teacher);
+        } catch (Exception e) {
+            log.error("互动发起失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 保存学生作答情况
+     *
+     * @return void
+     * @Param [student]
+     * @Author ywx
+     * @Date 2020/7/14 16:34
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveStuAnswer(TClassroomAskstudent student) {
+        try {
+            if (student.getStudentradio() == null) {
+                student.setStudentradio("");
+            }
+            if (student.getStudentpic() == null) {
+                student.setStudentpic("");
+            }
+            if (student.getRadiocorrect() == null) {
+                student.setRadiocorrect(0);
+            }
+            if (student.getStudentselected() == null) {
+                student.setStudentselected(0);
+            }
+            classroomAskstudentMapper.save(student);
+            //保存成功更新学生活跃值
+            classroomActivestudentMapper.updateActiveNum(student.getRoomid(), student.getStudentid());
+        } catch (Exception e) {
+            log.error("保存学生作答情况失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+
+    /**
+     * 保存课堂图片
+     *
+     * @return void
+     * @Param [file]
+     * @Author ywx
+     * @Date 2020/7/14 16:42
+     **/
+    public void saveFile(TClassroomFile file) {
+        try {
+            classroomFileMapper.save(file);
+        } catch (Exception e) {
+            log.error("批量保存课堂图片失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 功能描述 批量结束班级之前的课堂
+     *
+     * @param * @param classidlist
+     * @return void
+     * @author WN
+     * @date 2020/8/14
+     */
+    public void updateBatchRoomState(List<Integer> classidlist) {
+        classroomMapper.updateBatchRoomState(classidlist);
+    }
+
+    /**
+     * 获取批阅信息
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.RoomCorrectVo
+     * @Param [roomid]
+     * @Author ywx
+     * @Date 2020/9/9 15:37
+     **/
+    public RoomCorrectVo listCorrect(Long roomid) {
+        RoomCorrectVo correct = classroomMapper.listCorrect(roomid);
+        List<RoomCorrectCallVo> calls = correct.getCalls();
+        if (N_Utils.isListNotEmpty(calls)) {
+            for (RoomCorrectCallVo call : calls) {
+                call.setCorrectrate(N_Utils.getIntegerDivideAndMulitiply(call.getCorrectnum(), call.getStunum()));
+            }
+        }
+        List<RoomCorrectExamVo> exams = correct.getExams();
+        if (N_Utils.isListNotEmpty(exams)) {
+            for (RoomCorrectExamVo exam : exams) {
+                exam.setCorrectrate(N_Utils.getIntegerDivideAndMulitiply(exam.getCorrectnum(), exam.getStunum()));
+            }
+        }
+        return correct;
+    }
+
+    /**
+     * 获取提问批改学生列表
+     *
+     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/9 16:38
+     **/
+    public CheckClassVo listStudentsByAskTid(Long asktid) {
+        CheckClassVo classVo = classroomMapper.listStudentsByAskTid(asktid);
+        return getCheckClassVo(classVo);
+    }
+
+    /**
+     * 计算未提交数、批阅进度
+     *
+     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
+     * @Param [classVo]
+     * @Author ywx
+     * @Date 2020/9/10 8:56
+     **/
+    private CheckClassVo getCheckClassVo(CheckClassVo classVo) {
+        Integer ytjnum = classVo.getYtjnum();
+        classVo.setWtjnum(classVo.getClassnum() - ytjnum);
+        if (!N_Utils.isEmptyInteger(ytjnum)) {
+            double scale = N_Utils.getIntegerDivideAndMulitiply(classVo.getYpynum(), ytjnum);
+            classVo.setScale(scale);
+        } else {
+            classVo.setScale(0);
+        }
+        return classVo;
+    }
+
+    /**
+     * 获取考试批改学生列表
+     *
+     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
+     * @Param [paperid]
+     * @Author ywx
+     * @Date 2020/9/9 17:12
+     **/
+    public CheckClassVo listStudentsByPaperId(Long paperid) {
+        CheckClassVo classVo = classroomMapper.listStudentsByPaperId(paperid);
+        List<TClassroomPaperFile> files = classroomPaperFileMapper.listObjsByPaperid(paperid, 3);
+        classVo.setFiles(files);
+        return getCheckClassVo(classVo);
+    }
+
+    /**
+     * 获取课堂提问客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/10 11:12
+     **/
+    public ObjectiveVo callObjective(Long asktid, Integer realstunum) {
+        return classroomMapper.callObjective(asktid, realstunum);
+    }
+
+    /**
+     * 获取课堂考试客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
+     * @Param [pscaid]
+     * @Author ywx
+     * @Date 2020/9/10 11:21
+     **/
+    public ObjectiveVo examObjective(Long pscaid, Integer realstunum) {
+        return classroomMapper.examObjective(pscaid, realstunum);
+    }
+
+    /**
+     * 获取课堂提问主客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
+     * @Param [asktid]
+     * @Author ywx
+     * @Date 2020/9/10 14:01
+     **/
+    public SubjectiveVo callSubjective(Long asktid, Integer realstunum) {
+        return classroomMapper.callSubjective(asktid, realstunum);
+    }
+
+    /**
+     * 获取课堂考试主客观题详情
+     *
+     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
+     * @Param [pscaid]
+     * @Author ywx
+     * @Date 2020/9/10 14:25
+     **/
+    public SubjectiveVo examSubjective(Long pscaid, Integer realstunum) {
+        return classroomMapper.examSubjective(pscaid, realstunum);
+    }
+
+    /**
+     * 课堂提问批阅
+     *
+     * @return void
+     * @Param [asksid, radiocorrect]
+     * @Author ywx
+     * @Date 2020/9/10 15:08
+     **/
+    public void correctCall(Integer asksid, Integer radiocorrect) {
+        classroomMapper.correctCall(asksid, radiocorrect);
+    }
+
+    /**
+     * 修改学生作答记录（教师添加批注）
+     *
+     * @return void
+     * @Param [asksid, studentpic]
+     * @Author ywx
+     * @Date 2020/9/11 15:08
+     **/
+    public void updateStudentpic(Integer asksid, String studentpic) {
+        classroomAskstudentMapper.updateStudentpic(asksid, studentpic);
+    }
+
+    /**
+     * 学生课堂回顾列表
+     *
+     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
+     * @Param [room]
+     * @Author ywx
+     * @Date 2020/9/14 16:32
+     **/
+    public List<RoomVo> listStuClass(TClassroom room) {
+        return classroomMapper.listStuClass(room);
+    }
+
+    public ResultVo getReportStu(Long roomid, Integer studentid) {
+        Map room = classroomMapper.getReportStu(roomid, studentid);
+        return new ResultVo(0, "获取学生课堂回顾详情成功", room);
+    }
+
     /**
      * 获取教师指定章节下上过的课堂历史
+     *
+     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
      * @Param [room]
      * @Author ywx
      * @Date 2020/6/15 9:19
-     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
      **/
     public List<RoomVo> listClassByDirectorId(TClassroom room) {
         return classroomMapper.listClassByDirectorId(room);
@@ -44,10 +402,11 @@ public class ClassroomService {
 
     /**
      * 课堂回顾详情
+     *
+     * @return com.xhkjedu.sclass.vo.ResultVo
      * @Param [roomid]
      * @Author ywx
      * @Date 2020/6/26 9:36
-     * @return com.xhkjedu.sclass.vo.ResultVo
      **/
     public ResultVo getReport(Long roomid) {
         ReportRoomVo room = classroomMapper.getReport(roomid);
@@ -60,14 +419,14 @@ public class ClassroomService {
         List<ReportExamVo> exams = classroomMapper.listPaper(roomid);
         for (ReportExamVo exam : exams) {
             realstunum = exam.getYtjnum();
-            List<String> paperfiles = roomPaperFileMapper.listFilepath(exam.getPaperid());
+            List<String> paperfiles = classroomPaperFileMapper.listFilepath(exam.getPaperid());
             exam.setPaperfiles(paperfiles);
 
-            List<ReportEQuestionVo> equestions = classroomMapper.listExamReport(exam.getPaperid(),exam.getClassid());
+            List<ReportEQuestionVo> equestions = classroomMapper.listExamReport(exam.getPaperid(), exam.getClassid());
             for (ReportEQuestionVo equestion : equestions) {
-                Double correctrate = N_Utils.getDoubleDivideAndMulitiply(equestion.getCorrectrate(),realstunum);
+                Double correctrate = N_Utils.getDoubleDivideAndMulitiply(equestion.getCorrectrate(), realstunum);
                 equestion.setCorrectrate(correctrate);
-                equestion.setCommitrate(N_Utils.getDoubleDivideAndMulitiply(equestion.getCommitrate(),realstunum));
+                equestion.setCommitrate(N_Utils.getDoubleDivideAndMulitiply(equestion.getCommitrate(), realstunum));
             }
             exam.setQuestions(equestions);
         }
@@ -88,7 +447,7 @@ public class ClassroomService {
         //课堂学生列表
         List<Map> students = classroomSignMapper.listStudent(roomid);
         room.setStudents(students);
-        return new ResultVo(0, "获取课堂回顾详情成功",room);
+        return new ResultVo(0, "获取课堂回顾详情成功", room);
     }
 
     //删除课堂图片

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/RoomService.java

@@ -1,372 +0,0 @@
-package com.xhkjedu.sclass.service.classroom;
-
-import com.xhkjedu.sclass.mapper.classroom.ClassroomActivestudentMapper;
-import com.xhkjedu.sclass.mapper.classroom.ClassroomMapper;
-import com.xhkjedu.sclass.mapper.room.RoomAskstudentMapper;
-import com.xhkjedu.sclass.mapper.room.RoomAskteacherMapper;
-import com.xhkjedu.sclass.mapper.room.RoomFileMapper;
-import com.xhkjedu.sclass.mapper.room.RoomMapper;
-import com.xhkjedu.sclass.mapper.room.RoomPaperFileMapper;
-import com.xhkjedu.sclass.mapper.room.RoomSignMapper;
-import com.xhkjedu.sclass.model.classroom.TClassroom;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskstudent;
-import com.xhkjedu.sclass.model.classroom.TClassroomAskteacher;
-import com.xhkjedu.sclass.model.classroom.TClassroomFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomPaperFile;
-import com.xhkjedu.sclass.model.classroom.TClassroomSign;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.sclass.vo.classroom.ObjectiveVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo;
-import com.xhkjedu.sclass.vo.classroom.RoomCorrectVo;
-import com.xhkjedu.sclass.vo.classroom.RoomVo;
-import com.xhkjedu.sclass.vo.classroom.SubjectiveVo;
-import com.xhkjedu.sclass.vo.paper.CheckClassVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class RoomService {
-    @Resource
-    private ClassroomMapper classroomMapper;
-    @Resource
-    private RoomAskteacherMapper roomAskteacherMapper;
-    @Resource
-    private ClassroomActivestudentMapper classroomActivestudentMapper;
-    @Resource
-    private RoomAskstudentMapper roomAskstudentMapper;
-    @Resource
-    private RoomSignMapper roomSignMapper;
-    @Resource
-    private RoomFileMapper roomFileMapper;
-    @Resource
-    private RoomMapper roomMapper;
-    @Resource
-    private RoomPaperFileMapper roomPaperFileMapper;
-
-    /**
-     * 开始课堂
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/7/14 17:17
-     * @return void
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public boolean startClass(TClassroom room) {
-        boolean rtn = false;//课堂是否重复请求
-        try {
-            room.setRoomstate(1);
-            Integer num = classroomMapper.getStudentNumById(room.getClassid());//根据班级id获取学生数量
-            room.setClassnum(num);
-            roomMapper.save(room);
-            classroomActivestudentMapper.saveStuActive(room.getRoomid(),room.getClassid(),room.getSchoolid());
-        } catch (Exception e) {
-            if (e instanceof DuplicateKeyException) {
-                rtn = true;
-                log.error("接口重复请求，课堂id：" + room.getRoomid()+",课堂名称："+room.getRoomname());
-            } else {
-                log.error("开始课堂失败：" + e.getMessage());
-            }
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-        return rtn;
-    }
-
-    /**
-     * 结束课堂
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/7/14 17:17
-     * @return void
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void stopClass(TClassroom room) {
-        try {
-            Long roomid = room.getRoomid();
-            if (N_Utils.isEmptyInteger(room.getEndtime())) {//异常结束：结束时间=开始时间+45分钟
-                TClassroom tClassroom = roomMapper.selectByPrimaryKey(roomid);
-                room.setEndtime(tClassroom.getCreatetime() + 60 * 45);
-            }
-            classroomMapper.endClass(room);//结束课堂
-            classroomActivestudentMapper.updateActiveRank(roomid);//更新活跃值排名
-        } catch (Exception e) {
-            log.error("结束课堂失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-    /**
-     * 保存学生签到信息
-     * @Param [sign]
-     * @Author ywx
-     * @Date 2020/7/14 16:32
-     * @return void
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void saveStudentSign(TClassroomSign sign) {
-        try {
-            Long roomid = sign.getRoomid();
-            Integer userid = sign.getUserid();
-            List<Integer> studentids = roomMapper.listStudentId(roomid);//获取班级学生id集合
-            if (N_Utils.numInList(userid, studentids)) {//签到学生是本课堂所在班级学生，添加签到信息
-                roomSignMapper.save(sign);
-                //如果一个学生退出课堂再进来数据就不对了，最后计算
-                //classroomMapper.updateRealStuNum(sign.getRoomid());//更新班级实际签到学生数量
-                classroomActivestudentMapper.updateActiveNum(roomid,userid);//更新学生活跃值
-            }
-        } catch (Exception e) {
-            log.error("保存学生签到信息失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-
-    /**
-     *功能描述 最后更新课堂名称
-     * @author WN
-     * @date 2020/8/14
-     * @param  * @param roomlist
-     * @return void
-     */
-    public void updateBatchRoomRealStunum(List<Long> roomlist){
-        classroomMapper.updateBatchRoomRealStunum(roomlist);
-    }
-
-    /**
-     * 互动发起
-     * @Param [teacher]
-     * @Author ywx
-     * @Date 2020/6/15 9:58
-     * @return void
-     **/
-    public void saveWork(TClassroomAskteacher teacher) {
-        try {
-            if (teacher.getPaperid() == null){
-                teacher.setPaperid(0L);
-            }
-            if (teacher.getRadionum() == null){
-                teacher.setRadionum(0);
-            }
-            roomAskteacherMapper.save(teacher);
-        } catch (Exception e) {
-            log.error("互动发起失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 保存学生作答情况
-     * @Param [student]
-     * @Author ywx
-     * @Date 2020/7/14 16:34
-     * @return void
-     **/
-    @Transactional(rollbackFor = Exception.class)
-    public void saveStuAnswer(TClassroomAskstudent student) {
-        try {
-            if (student.getStudentradio() == null){
-                student.setStudentradio("");
-            }
-            if (student.getStudentpic() == null){
-                student.setStudentpic("");
-            }
-            if (student.getRadiocorrect() == null){
-                student.setRadiocorrect(0);
-            }
-            if (student.getStudentselected() == null){
-                student.setStudentselected(0);
-            }
-            roomAskstudentMapper.save(student);
-            //保存成功更新学生活跃值
-            classroomActivestudentMapper.updateActiveNum(student.getRoomid(),student.getStudentid());
-        } catch (Exception e) {
-            log.error("保存学生作答情况失败：" + e.getMessage());
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-        }
-    }
-
-    /**
-     * 保存课堂图片
-     * @Param [file]
-     * @Author ywx
-     * @Date 2020/7/14 16:42
-     * @return void
-     **/
-    public void saveFile(TClassroomFile file) {
-        try {
-            roomFileMapper.save(file);
-        } catch (Exception e) {
-            log.error("批量保存课堂图片失败："+e.getMessage());
-        }
-    }
-
-    /**
-     *功能描述 批量结束班级之前的课堂
-     * @author WN
-     * @date 2020/8/14
-     * @param  * @param classidlist
-     * @return void
-     */
-    public void updateBatchRoomState(List<Integer> classidlist){
-        classroomMapper.updateBatchRoomState(classidlist);
-    }
-
-    /**
-     * 获取批阅信息
-     * @Param [roomid]
-     * @Author ywx
-     * @Date 2020/9/9 15:37
-     * @return com.xhkjedu.sclass.vo.classroom.RoomCorrectVo
-     **/
-    public RoomCorrectVo listCorrect(Long roomid) {
-        RoomCorrectVo correct = roomMapper.listCorrect(roomid);
-        List<RoomCorrectCallVo> calls = correct.getCalls();
-        if (N_Utils.isListNotEmpty(calls)){
-            for (RoomCorrectCallVo call : calls) {
-                call.setCorrectrate(N_Utils.getIntegerDivideAndMulitiply(call.getCorrectnum(),call.getStunum()));
-            }
-        }
-        List<RoomCorrectExamVo> exams = correct.getExams();
-        if (N_Utils.isListNotEmpty(exams)){
-            for (RoomCorrectExamVo exam : exams) {
-                exam.setCorrectrate(N_Utils.getIntegerDivideAndMulitiply(exam.getCorrectnum(),exam.getStunum()));
-            }
-        }
-        return correct;
-    }
-
-    /**
-     * 获取提问批改学生列表
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/9 16:38
-     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
-     **/
-    public CheckClassVo listStudentsByAskTid(Long asktid) {
-        CheckClassVo classVo = roomMapper.listStudentsByAskTid(asktid);
-        return getCheckClassVo(classVo);
-    }
-
-    /**
-     * 计算未提交数、批阅进度
-     * @Param [classVo]
-     * @Author ywx
-     * @Date 2020/9/10 8:56
-     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
-     **/
-    private CheckClassVo getCheckClassVo(CheckClassVo classVo) {
-        Integer ytjnum = classVo.getYtjnum();
-        classVo.setWtjnum(classVo.getClassnum() - ytjnum);
-        if (!N_Utils.isEmptyInteger(ytjnum)) {
-            double scale = N_Utils.getIntegerDivideAndMulitiply(classVo.getYpynum(), ytjnum);
-            classVo.setScale(scale);
-        } else {
-            classVo.setScale(0);
-        }
-        return classVo;
-    }
-
-    /**
-     * 获取考试批改学生列表
-     * @Param [paperid]
-     * @Author ywx
-     * @Date 2020/9/9 17:12
-     * @return com.xhkjedu.sclass.vo.paper.CheckClassVo
-     **/
-    public CheckClassVo listStudentsByPaperId(Long paperid) {
-        CheckClassVo classVo = roomMapper.listStudentsByPaperId(paperid);
-        List<TClassroomPaperFile> files = roomPaperFileMapper.listObjsByPaperid(paperid , 3);
-        classVo.setFiles(files);
-        return getCheckClassVo(classVo);
-    }
-
-    /**
-     * 获取课堂提问客观题详情
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/10 11:12
-     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
-     **/
-    public ObjectiveVo callObjective(Long asktid, Integer realstunum) {
-        return roomMapper.callObjective(asktid, realstunum);
-    }
-
-    /**
-     * 获取课堂考试客观题详情
-     * @Param [pscaid]
-     * @Author ywx
-     * @Date 2020/9/10 11:21
-     * @return com.xhkjedu.sclass.vo.classroom.ObjectiveVo
-     **/
-    public ObjectiveVo examObjective(Long pscaid, Integer realstunum) {
-        return roomMapper.examObjective(pscaid, realstunum);
-    }
-
-    /**
-     * 获取课堂提问主客观题详情
-     * @Param [asktid]
-     * @Author ywx
-     * @Date 2020/9/10 14:01
-     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
-     **/
-    public SubjectiveVo callSubjective(Long asktid, Integer realstunum) {
-        return roomMapper.callSubjective(asktid, realstunum);
-    }
-
-    /**
-     * 获取课堂考试主客观题详情
-     * @Param [pscaid]
-     * @Author ywx
-     * @Date 2020/9/10 14:25
-     * @return com.xhkjedu.sclass.vo.classroom.SubjectiveVo
-     **/
-    public SubjectiveVo examSubjective(Long pscaid, Integer realstunum) {
-        return roomMapper.examSubjective(pscaid, realstunum);
-    }
-
-    /**
-     * 课堂提问批阅
-     * @Param [asksid, radiocorrect]
-     * @Author ywx
-     * @Date 2020/9/10 15:08
-     * @return void
-     **/
-    public void correctCall(Integer asksid, Integer radiocorrect) {
-        roomMapper.correctCall(asksid,radiocorrect);
-    }
-
-    /**
-     * 修改学生作答记录（教师添加批注）
-     * @Param [asksid, studentpic]
-     * @Author ywx
-     * @Date 2020/9/11 15:08
-     * @return void
-     **/
-    public void updateStudentpic(Integer asksid, String studentpic) {
-        roomAskstudentMapper.updateStudentpic(asksid, studentpic);
-    }
-
-    /**
-     * 学生课堂回顾列表
-     * @Param [room]
-     * @Author ywx
-     * @Date 2020/9/14 16:32
-     * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
-     **/
-    public List<RoomVo> listStuClass(TClassroom room) {
-        return roomMapper.listStuClass(room);
-    }
-
-    public ResultVo getReportStu(Long roomid, Integer studentid) {
-        Map room = roomMapper.getReportStu(roomid, studentid);
-        return new ResultVo(0, "获取学生课堂回顾详情成功",room);
-    }
-}

sclass/src/main/java/com/xhkjedu/sclass/task/UriMapTask.java

@@ -0,0 +1,49 @@
+package com.xhkjedu.sclass.task;
+
+import com.xhkjedu.sclass.utils.ClassUtil;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author ywx
+ * @classname ReadTask
+ * @description 阅读定时任务
+ * CronTrigger配置完整格式为： [秒] [分] [小时] [日] [月] [周] [年]
+ * 说明    必填    值                  允许的通配符
+ * 秒        是    0-59                , - * /
+ * 分        是    0-59                , - * /
+ * 时        是    0-23                , - * /
+ * 日        是    1-31                , - * ? / L W
+ * 月        是    1-12或JAN-DEC       , - * /
+ * 周        是    1-7或SUN-SAT        , - * ? / L W
+ * 年        否    empty 或1970-2099   , - * /
+ * , 表示指定多个值，例如在周字段上设置 "MON,WED,FRI" 表示周一，周三和周五触发
+ * - 表示区间。例如 在小时上设置 "10-12",表示 10,11,12点都会触发。
+ * * 表示所有值. 例如:在分的字段上设置 "*",表示每一分钟都会触发
+ * ? 表示不指定值。使用的场景为不需要关心当前设置这个字段的值。每月的10号触发一个操作，但不关心是周几,具体设置为 0 0 0 10 * ?
+ * / 用于递增触发。如在秒上面设置"5/15" 表示从5秒开始，每增15秒触发(5,20,35,50)
+ * L 表示最后的意思。在日字段设置上，表示当月的最后一天(依据当前月份，如果是二月还会依据是否是润年[leap]),
+ * 在周字段上表示星期六，相当于"7"或"SAT(不区分大小写)"。
+ * 如果在"L"前加上数字，则表示该数据的最后一个。例如在周字段上设置"6L"这样的格式,则表示“本月最后一个星期五"
+ * W 表示离指定日期的最近那个工作日(周一至周五). 例如在日字段上设置"15W"，表示离每月15号最近的那个工作日触发。
+ * 如果15号正好是周六，则找最近的周五(14号)触发, 如果15号是周未，则找最近的下周一(16号)触发.
+ * 如果15号正好在工作日(周一至周五)，则就在该天触发。(注，"W"前只能设置具体的数字,不允许区间"-").
+ * @date 2020/9/1 9:36
+ **/
+@Component
+public class UriMapTask {
+
+    /**
+     * 每隔3s清除一下请求地址map
+     * @Param []
+     * @Author ywx
+     * @Date 2020/11/9 12:30
+     * @return void
+     **/
+    @Scheduled(cron = "${cron.deleteUriMap}")
+    public void deleteUriMap() {
+        ClassUtil.uriMap = new ConcurrentHashMap<>();
+    }
+}

sclass/src/main/resources/application.properties

@@ -52,3 +52,8 @@ spring.redis.jedis.pool.max-active=60000
 redisdatatime=604800
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
+#定时任务
+#每隔3s清除一下请求地址map
+cron.deleteUriMap=0/3 * * * * ?
+#默认为false，不开启定时任务
+enable.scheduled=false

sclass/src/main/resources/mapper/room/RoomAskstudentMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomAskstudentMapper.xml

@@ -1,6 +1,6 @@
 <?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.sclass.mapper.room.RoomAskstudentMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomAskstudentMapper">
     <!--保存学生作答情况-->
     <insert id="save">
         insert into t_classroom_askstudent

sclass/src/main/resources/mapper/room/RoomAskteacherMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomAskteacherMapper.xml

@@ -1,6 +1,6 @@
 <?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.sclass.mapper.room.RoomAskteacherMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomAskteacherMapper">
     <!--保存教师互动信息-->
     <insert id="save">
         insert into t_classroom_askteacher

sclass/src/main/resources/mapper/classroom/ClassroomFileMapper.xml

@@ -2,7 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomFileMapper">
     <!--获取课堂图片列表-->
-    <select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
-        SELECT * FROM t_classroom_file WHERE roomid=#{roomid} ORDER BY rfid
-    </select>
+    <!--<select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">-->
+    <!--    SELECT * FROM t_classroom_file WHERE roomid=#{roomid} ORDER BY rfid-->
+    <!--</select>-->
+    <!--保存课堂图片信息-->
+    <insert id="save">
+        insert into t_classroom_file(roomid,rfpath,rftype,createid,createtime,schoolid)
+        values (#{r.roomid},#{r.rfpath},#{r.rftype},#{r.createid},#{r.createtime},#{r.schoolid})
+    </insert>
 </mapper>

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -1,6 +1,274 @@
 <?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.sclass.mapper.classroom.ClassroomMapper">
+    <!--保存课堂-->
+    <insert id="save">
+        insert into t_classroom(roomid,roomname,classid,roomstate,lsbid,teacherid,directorid
+        ,directortype,classnum,endtime,createid,createtime,schoolid)
+        values
+        (#{r.roomid},#{r.roomname},#{r.classid},#{r.roomstate},#{r.lsbid},#{r.teacherid},#{r.directorid}
+        ,#{r.directortype},#{r.classnum},#{r.endtime},#{r.teacherid},#{r.createtime},#{r.schoolid})
+    </insert>
+    <!--获取班级学生id集合-->
+    <select id="listStudentId" resultType="java.lang.Integer">
+        select cs.studentid from t_class_student cs
+        left join t_classroom r on cs.classid=r.classid
+        where r.roomid=#{roomid};
+    </select>
+    <!--获取批阅信息-->
+    <resultMap id="correctResult" type="com.xhkjedu.sclass.vo.classroom.RoomCorrectVo">
+        <result property="roomid" column="roomid"></result>
+        <result property="roomname" column="roomname"></result>
+        <result property="createtime" column="createtime"></result>
+        <result property="endtime" column="endtime"></result>
+        <result property="classname" column="classname"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <result property="teachername" column="teachername"></result>
+        <collection property="calls" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo"
+                    select="listCall" column="{roomid=roomid,realstunum=realstunum}">
+        </collection>
+        <collection property="exams" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo"
+                    select="listExam" column="{roomid=roomid,realstunum=realstunum}">
+        </collection>
+    </resultMap>
+    <select id="listCall" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo">
+        select s.asktid,count(*)commitnum,count(*) stunum
+        ,sum(case when s.radiocorrect!=0 then 1 else 0 end)correctnum
+        from t_classroom_askstudent s left join t_classroom_askteacher rt on s.asktid=rt.asktid
+        where rt.roomid=#{roomid} and rt.asktype between 32 and 33
+        group by s.asktid
+    </select>
+    <select id="listExam" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo">
+        select s.paperid,p.papername,count(*)commitnum,count(*) stunum
+        ,sum(case when s.pschecked!=0 then 1 else 0 end)correctnum
+        from t_classroom_paper_student s left join t_classroom_paper p on s.paperid=p.paperid
+        left join t_classroom_askteacher rt on s.paperid=rt.paperid
+        where rt.roomid=#{roomid} and rt.asktype=40
+        group by s.paperid
+    </select>
+    <select id="listCorrect" resultMap="correctResult">
+        select r.roomid,r.roomname,r.createtime,r.endtime,r.realstunum
+        ,c.classname,c.gradeid
+        ,(select u.username  from t_user u where u.userid=r.createid)teachername
+        from t_classroom r left join t_class c on r.classid=c.classid
+        where r.roomid=#{roomid}
+    </select>
+
+    <!--获取提问批改学生列表-->
+    <resultMap id="checkResult" type="com.xhkjedu.sclass.vo.paper.CheckClassVo">
+        <result property="classid" column="classid"></result>
+        <result property="classnum" column="classnum"></result>
+        <result property="ytjnum" column="ytjnum"></result>
+        <result property="ypynum" column="ypynum"></result>
+        <result property="teacherpic" column="teacherpic"></result>
+        <collection property="students" ofType="com.xhkjedu.sclass.vo.paperstudent.StudentVo">
+            <result property="psid" column="psid"></result>
+            <result property="studentid" column="studentid"></result>
+            <result property="studentname" column="studentname"></result>
+            <result property="pschecked" column="pschecked"></result>
+            <result property="studentpic" column="studentpic"></result>
+        </collection>
+    </resultMap>
+    <select id="listStudentsByAskTid" resultMap="checkResult">
+        select rs.classid,rs.asksid psid,rs.studentid,u.username studentname,rs.radiocorrect pschecked,rs.studentpic,rt.teacherpic
+        ,count(rs2.asksid)ytjnum,count(rs2.asksid)classnum
+        ,sum(case when rs2.radiocorrect!=0 then 1 else 0 end)ypynum
+        from t_classroom_askstudent rs left join t_user u on rs.studentid=u.userid
+        left join t_classroom_askteacher rt on rs.asktid=rt.asktid
+        left join t_classroom_askstudent rs2 on rs2.asktid=rs.asktid
+        where rs.asktid=#{asktid}
+        group by rs.asksid
+    </select>
+    <!--获取考试批改学生列表-->
+    <select id="listStudentsByPaperId" resultMap="checkResult">
+        select ps.classid,ps.paperid,ps.psid,ps.studentid,u.username studentname,ps.pschecked
+        ,count(ps2.psid)ytjnum,count(ps2.psid)classnum
+        ,sum(case when ps2.pschecked=1 then 1 else 0 end)ypynum
+        from t_classroom_paper_student ps left join t_user u on ps.studentid=u.userid
+        left join t_classroom_paper_student ps2 on ps2.paperid=ps.paperid
+        where ps.paperid=#{paperid}
+        group by ps.psid
+    </select>
+
+    <resultMap id="objectiveResult" type="com.xhkjedu.sclass.vo.classroom.ObjectiveVo">
+        <result property="typename" column="typename"></result>
+        <result property="answer" column="answer"></result>
+        <result property="correctrate" column="correctrate"></result>
+        <result property="psorder" column="psorder"></result>
+        <result property="psscore" column="psscore"></result>
+        <result property="avgscore" column="avgscore"></result>
+        <result property="maxscore" column="maxscore"></result>
+        <collection property="answers" ofType="com.xhkjedu.sclass.vo.classroom.ObjectiveAnswerVo">
+            <result property="section" column="section"></result>
+            <result property="stunum" column="stunum"></result>
+            <result property="stuscore" column="stuscore"></result>
+            <result property="stuname" column="stuname"></result>
+        </collection>
+    </resultMap>
+    <!--客观题详情-->
+    <select id="callObjective" resultMap="objectiveResult">
+        select (case rt.asktype when 30 then '判断题' when 31 then '选择题' when 32 then '简答题' else '画图题' end )typename
+        ,rt.radioanswer answer,rs.studentradio section,count(*)stunum
+        ,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
+        ,truncate((select sum(case when rs2.radiocorrect=1 then 1 else 0 end)*100/
+        count(*) from t_classroom_askstudent rs2 where rs2.asktid=rt.asktid),2)correctrate
+        from t_classroom_askstudent rs right join t_classroom_askteacher rt on rs.asktid=rt.asktid
+        left join t_user u on rs.studentid=u.userid
+        where rt.asktid=#{asktid}
+        group by rs.studentradio
+    </select>
+    <!--2020.11.16修改，125行添加left-->
+    <select id="examObjective" resultMap="objectiveResult">
+        select ps.ctypename typename,ps.psanswer answer,ps.psorder,ps.psscore
+        ,pss.useranswer section,count(*)stunum,pss.stuscore,a.avgscore,a.maxscore
+        ,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
+        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid
+        left join (select truncate(sum(pss2.stuscore)/(select count(ps2.psid)
+        from t_classroom_paper_student ps2 where ps2.paperid=pss2.paperid),2)avgscore
+        ,max(pss2.stuscore)maxscore,pss2.pscaid
+        FROM t_classroom_paper_student_scantron pss2 WHERE pss2.pscaid=#{pscaid})a on ps.pscaid=a.pscaid
+        left join t_user u on pss.studentid=u.userid
+        where ps.pscaid=#{pscaid}
+        group by pss.useranswer
+    </select>
+
+    <resultMap id="subjectiveResult" type="com.xhkjedu.sclass.vo.classroom.SubjectiveVo">
+        <result property="typename" column="typename"></result>
+        <result property="correctrate" column="correctrate"></result>
+        <result property="psorder" column="psorder"></result>
+        <result property="psscore" column="psscore"></result>
+        <result property="avgscore" column="avgscore"></result>
+        <result property="maxscore" column="maxscore"></result>
+        <collection property="answers" ofType="java.util.Map">
+            <result property="useranswer" column="useranswer"></result>
+            <result property="checked" column="checked"></result>
+            <result property="stuscore" column="stuscore"></result>
+            <result property="stuname" column="stuname"></result>
+        </collection>
+    </resultMap>
+    <!--主观题详情-->
+    <select id="callSubjective" resultMap="subjectiveResult">
+        select (case rt.asktype when 30 then '判断题' when 31 then '选择题' when 32 then '简答题' else '画图题' end )typename
+        ,rs.studentpic useranswer,rs.radiocorrect checked,u.username stuname
+        ,(select ifnull(truncate(sum(case when s.radiocorrect=1 then 1 else 0 end)*100/count(*),2),0)
+        from t_classroom_askstudent s where s.asktid=rt.asktid)correctrate
+        from t_classroom_askstudent rs right join t_classroom_askteacher rt on rs.asktid=rt.asktid
+        left join t_user u on rs.studentid=u.userid
+        where rt.asktid=#{asktid}
+    </select>
+    <select id="examSubjective" resultMap="subjectiveResult">
+        select ps.ctypename typename,ps.psorder,ps.psscore,a.avgscore,a.maxscore
+        ,pss.useranswer,pss.checked,pss.stuscore,u.username stuname
+        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid
+        left join t_user u on pss.studentid=u.userid
+        left join(select truncate(sum(pss1.stuscore)/(select count(ps2.psid)
+        from t_classroom_paper_student ps2 where ps2.paperid=pss1.paperid),2)avgscore
+        ,max(pss1.stuscore)maxscore,pss1.pscaid
+        from t_classroom_paper_student_scantron pss1 where pss1.pscaid=#{pscaid})a on pss.pscaid=a.pscaid
+        where ps.pscaid=#{pscaid}
+    </select>
+
+    <!--课堂提问批阅-->
+    <update id="correctCall">
+        update t_classroom_askstudent set radiocorrect=#{radiocorrect} where asksid=#{asksid}
+    </update>
+    <!--学生课堂回顾列表-->
+    <select id="listStuClass" resultType="com.xhkjedu.sclass.vo.classroom.RoomVo">
+        select r.roomid,r.roomname,r.classid,r.roomstate,r.directorid,r.createtime,r.endtime,r.realstunum,u.username createname
+        ,(select d.directorname from t_director d where d.directorid=r.directorid)directorname
+        from t_classroom r left join t_user u on r.teacherid=u.userid
+        left join t_subject_book sb on r.lsbid=sb.lsbid
+        left join t_class_student cs on r.classid=cs.classid
+        where cs.studentid=#{room.studentid} and sb.subjectid=#{room.subjectid}
+        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">and r.directorid=#{room.directorid}</if>
+        order by r.createtime desc
+    </select>
+    <!--学生课堂回顾详情-->
+    <resultMap id="stuRoomResult" type="java.util.Map">
+        <result property="roomid" column="roomid"></result>
+        <result property="roomname" column="roomname"></result>
+        <result property="createtime" column="createtime"></result>
+        <result property="endtime" column="endtime"></result>
+        <result property="classnum" column="classnum"></result>
+        <result property="realstunum" column="realstunum"></result>
+        <collection property="questions" ofType="java.util.Map"
+                    select="listStuCall" column="{roomid=roomid,studentid=studentid}">
+        </collection>
+        <collection property="exams" ofType="java.util.Map"
+                    select="listStuExam" column="{roomid=roomid,studentid=studentid,realstunum=realstunum}">
+        </collection>
+        <collection property="asks" ofType="java.util.Map"
+                    select="listStuAsk" column="{roomid=roomid,studentid=studentid}">
+        </collection>
+        <collection property="files" ofType="com.xhkjedu.sclass.model.classroom.TClassroomFile"
+                    select="listFile" column="{roomid=roomid}">
+        </collection>
+    </resultMap>
+    <select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
+        select * from t_classroom_file where roomid=#{roomid}
+    </select>
+    <select id="getReportStu" resultMap="stuRoomResult">
+        select r.roomid,r.roomname,r.endtime,r.createtime,r.classnum,r.realstunum,#{studentid} studentid
+        from t_classroom r where r.roomid=#{roomid} limit 1
+    </select>
+    <select id="listStuCall" resultType="java.util.Map">
+        select rt.asktype,rt.teacherpic,rt.radioanswer,ifnull(s.createtime,0)createtime,s.radiocorrect
+        ,(case when rt.asktype between 32 and 33 then s.studentpic else s.studentradio end)useranswer
+        ,(select ifnull(truncate(sum(case when s1.radiocorrect=1 then 1 else 0 end)*100/count(*),2),0)
+        from t_classroom_askstudent s1 where s1.asktid=rt.asktid)correctrate
+        from t_classroom_askstudent s right join t_classroom_askteacher rt on s.asktid=rt.asktid and s.studentid=#{studentid}
+        where rt.roomid=#{roomid} and rt.asktype between 30 and 33
+        group by rt.asktid
+    </select>
+    <select id="listStuAsk" resultType="java.util.Map">
+        select a.asktype,a.fqnum,a.cynum,truncate(a.cynum*100/a.fqnum,2)cyrate
+        from(select rt.asktype,count(distinct rt.asktid)fqnum,(select count(*) from t_classroom_askstudent s1
+        left join t_classroom_askteacher rt1 on s1.asktid=rt1.asktid
+        where rt1.roomid=rt.roomid and rt1.asktype=rt.asktype and s1.studentid=#{studentid})cynum
+        from t_classroom_askstudent s right join t_classroom_askteacher rt on s.asktid=rt.asktid
+        where rt.roomid=#{roomid} and rt.asktype between 20 and 21
+        group by rt.asktype)a
+    </select>
+    <resultMap id="stuExamResult" type="java.util.Map">
+        <result property="paperid" column="paperid"></result>
+        <result property="papername" column="papername"></result>
+        <result property="papernum" column="papernum"></result>
+        <result property="paperscore" column="paperscore"></result>
+        <result property="avgscore" column="avgscore"></result>
+        <result property="maxscore" column="maxscore"></result>
+        <result property="scorerate" column="scorerate"></result>
+        <result property="stuscore" column="stuscore"></result>
+        <collection property="files" ofType="java.lang.String"
+                    select="listStuEFile" column="{paperid=paperid}">
+        </collection>
+        <collection property="questions" ofType="java.util.Map"
+                    select="listStuEQuestion" column="{paperid=paperid,studentid=studentid,realstunum=realstunum}">
+        </collection>
+    </resultMap>
+    <select id="listStuEFile" resultType="java.lang.String">
+        select filepath from t_classroom_paper_file where paperid=#{paperid} order by fileorder
+    </select>
+    <select id="listStuExam" resultMap="stuExamResult">
+        select p.paperid,p.papername,p.papernum,p.paperscore
+        ,(select ifnull(truncate(sum(s.stuscore)/(count(s.psid)*s.paperscore),2),0))avgscore
+        ,(select ifnull(max(s.stuscore),0))maxscore
+        ,ifnull(truncate(s1.stuscore*100/p.paperscore,2),0)scorerate,ifnull(s1.stuscore,0)stuscore,s1.psid
+        ,#{studentid} studentid,count(s.psid) realstunum
+        from t_classroom_paper p right join t_classroom_askteacher rt on p.paperid=rt.paperid
+        left join t_classroom_paper_student s on s.paperid=p.paperid
+        left join t_classroom_paper_student s1 on s1.paperid=rt.paperid and s1.studentid=#{studentid}
+        where rt.roomid=#{roomid} and rt.asktype=40 and p.paperid is not null
+        group by p.paperid
+    </select>
+    <select id="listStuEQuestion" resultType="java.util.Map">
+        select
+        ps.pscaid,ps.psorder,ps.ctypename,ps.ctype,ps.psscore,ps.psanswer,ifnull(pss.stuscore,0)stuscore,pss.useranswer
+        ,ifnull(truncate(pss.stuscore*100/pss.qscore,2),0)scorerate
+        ,ifnull(truncate(sum(pss1.stuscore)/#{realstunum},2),0)avgscore,ifnull(max(pss1.stuscore),0)maxscore
+        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss1 on ps.pscaid=pss1.pscaid
+        left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid and pss.studentid=#{studentid}
+        where ps.paperid=#{paperid} group by ps.pscaid
+    </select>
     <!--结束课堂-->
     <update id="endClass">
         UPDATE t_classroom SET roomstate=2,endtime=#{room.endtime} where roomid=#{room.roomid};
@@ -17,7 +285,9 @@
     </select>
     <!--获取教师指定章节下上过的课堂历史-->
     <select id="listClassByDirectorId" resultType="com.xhkjedu.sclass.vo.classroom.RoomVo">
-        SELECT c.roomid,c.roomname,c.classid,g.classname,g.gradeid,c.roomstate,c.createtime,c.endtime,c.realstunum,d.directorname,u.username createname
+        SELECT
+        c.roomid,c.roomname,c.classid,g.classname,g.gradeid,c.roomstate,c.createtime,c.endtime,c.realstunum,d.directorname,u.username
+        createname
         ,(select count(rs.asksid)+count(ps.psid) from t_classroom_askteacher rt
         left join t_classroom_askstudent rs on rt.asktid=rs.asktid and rs.radiocorrect=0
         left join t_classroom_paper_student ps on rt.paperid=ps.paperid and ps.pschecked!=1
@@ -26,15 +296,20 @@
         left join t_director d on c.directorid=d.directorid
         left join t_user u on c.teacherid=u.userid
         WHERE c.teacherid=#{room.teacherid} and c.lsbid=#{room.lsbid}
-        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">AND c.directorid=#{room.directorid}</if>
+        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">AND
+            c.directorid=#{room.directorid}
+        </if>
         <if test="room.classid!=null and room.classid!=0">AND c.classid=#{room.classid}</if>
-        <if test="room.createtime!=null and room.createtime!=0">AND UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))>=#{room.createtime}</if>
+        <if test="room.createtime!=null and room.createtime!=0">AND
+            UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))>=#{room.createtime}
+        </if>
         <if test="room.endtime!=null and room.endtime!=0">AND UNIX_TIMESTAMP(FROM_UNIXTIME(c.createtime,'%Y%m%d'))&lt;=#{room.endtime}</if>
         ORDER BY c.createtime DESC
     </select>
     <!--更新班级实际签到学生数量-->
     <update id="updateBatchRoomRealStunum" parameterType="java.util.List">
-        UPDATE t_classroom c SET c.realstunum=(SELECT COUNT(DISTINCT s.userid) FROM t_classroom_sign s WHERE s.roomid=c.roomid )
+        UPDATE t_classroom c SET c.realstunum=(SELECT COUNT(DISTINCT s.userid) FROM t_classroom_sign s WHERE
+        s.roomid=c.roomid )
         WHERE
         <foreach collection="list" item="roomid" index="index" separator="or">
             c.roomid=#{roomid}
@@ -60,7 +335,8 @@
     <select id="listQuestionReport" resultType="java.util.Map">
         select ct.asktype,ct.teacherpic,ct.asktid,ct.radioanswer
         ,(case when count(cs.asksid)=0 then 0 else 100 end)commitrate
-        ,ifnull(truncate(sum(case when cs.radiocorrect=1 and cs.classid=c.classid then 1 else 0 end)*100/count(cs.asksid),2),0)correctrate
+        ,ifnull(truncate(sum(case when cs.radiocorrect=1 and cs.classid=c.classid then 1 else 0
+        end)*100/count(cs.asksid),2),0)correctrate
         from t_classroom_askteacher ct left join t_classroom_askstudent cs on ct.asktid = cs.asktid
         left join t_classroom c on ct.roomid=c.roomid and cs.classid=c.classid
         where ct.roomid=#{roomid} and ct.asktype between 30 and 33
@@ -102,9 +378,9 @@
     </select>
     <!--获取课堂考试列表-->
     <select id="listPaper" resultType="com.xhkjedu.sclass.vo.classroom.ReportExamVo">
-      SELECT p.paperid,p.papername,c.classid,truncate(SUM(ps.stuscore)*100/(p.paperscore*COUNT(ps.psid)),2)scorerate
+        SELECT p.paperid,p.papername,c.classid,truncate(SUM(ps.stuscore)*100/(p.paperscore*COUNT(ps.psid)),2)scorerate
         ,truncate(SUM(ps.stuscore)/COUNT(ps.psid),2)avgscore,MAX(ps.stuscore)maxscore,COUNT(ps.psid)ytjnum,0 wjtnum
-        FROM  t_classroom_paper p
+        FROM t_classroom_paper p
         LEFT JOIN t_classroom_paper_student ps ON p.paperid=ps.paperid
         LEFT JOIN t_classroom_askteacher rt ON p.paperid=rt.paperid
         LEFT JOIN t_classroom c ON rt.roomid=c.roomid

sclass/src/main/resources/mapper/room/RoomPaperFileMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomPaperFileMapper.xml

@@ -1,6 +1,6 @@
 <?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.sclass.mapper.room.RoomPaperFileMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperFileMapper">
     <!-- 根据作业id获取作业附件 -->
     <select id="listObjsByPaperid" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperFile">
         SELECT pfid,paperid,filepath,fileclass,fileorder,createtime

sclass/src/main/resources/mapper/room/RoomPaperQtypeMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomPaperQtypeMapper.xml

@@ -1,11 +1,12 @@
 <?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.sclass.mapper.room.RoomPaperQtypeMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperQtypeMapper">
     <!--保存答题卡题型-->
     <insert id="batchSave">
-        insert into t_classroom_paper_qtype(pqtypeid,paperid,ctype,ctypename,pqorder,pqscore,pqnum,createid,createtime,schoolid)
+        insert into
+        t_classroom_paper_qtype(pqtypeid,paperid,ctype,ctypename,pqorder,pqscore,pqnum,createid,createtime,schoolid)
         values
-        <foreach collection ="list" item="r" index= "index" separator =",">
+        <foreach collection="list" item="r" index="index" separator=",">
             (#{r.pqtypeid},#{r.paperid},#{r.ctype},#{r.ctypename},#{r.pqorder},#{r.pqscore},#{r.pqnum}
             ,#{r.createid},#{r.createtime},#{r.schoolid})
         </foreach>

sclass/src/main/resources/mapper/room/RoomPaperScantronMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomPaperScantronMapper.xml

@@ -1,12 +1,12 @@
 <?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.sclass.mapper.room.RoomPaperScantronMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperScantronMapper">
     <!--保存答题卡题型下试题-->
     <insert id="batchSave">
         insert into t_classroom_paper_scantron(pscaid,paperid,pqtypeid,ctype,ctypename,psorder,psscore
         ,createid,createtime,schoolid,psanswer)
         values
-        <foreach collection ="list" item="r" index= "index" separator =",">
+        <foreach collection="list" item="r" index="index" separator=",">
             (#{r.pscaid},#{r.paperid},#{r.pqtypeid},#{r.ctype},#{r.ctypename},#{r.psorder},#{r.psscore}
             ,#{r.createid},#{r.createtime},#{r.schoolid},#{r.psanswer})
         </foreach>

sclass/src/main/resources/mapper/room/RoomPaperStudentMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomPaperStudentMapper.xml

@@ -1,6 +1,6 @@
 <?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.sclass.mapper.room.RoomPaperStudentMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentMapper">
     <!--获取考试学生信息-->
     <select id="findById" resultType="com.xhkjedu.sclass.model.classroom.TClassroomPaperStudent">
         select s.*,p.subjectid,p.papername from t_classroom_paper_student s

sclass/src/main/resources/mapper/room/RoomPaperStudentScantronMapper.xml → sclass/src/main/resources/mapper/classroom/ClassroomPaperStudentScantronMapper.xml

@@ -1,12 +1,12 @@
 <?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.sclass.mapper.room.RoomPaperStudentScantronMapper">
+<mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomPaperStudentScantronMapper">
     <!--批量更新试题批改信息-->
     <update id="updateScantronQuestionBatch" parameterType="java.util.List">
         UPDATE t_classroom_paper_student_scantron
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="stuscore = CASE " suffix="END,">
-                <foreach collection="list" index="index" item="item" >
+                <foreach collection="list" index="index" item="item">
                     when pssid = #{item.pssid} then #{item.stuscore}
                 </foreach>
             </trim>

sclass/src/main/resources/mapper/classroom/ClassroomSignMapper.xml

@@ -15,5 +15,10 @@
         where r.roomid=#{roomid} and cs.userid is null group by s.studentid)a
         order by convert(a.studentname using gbk)
     </select>
+    <!--保存学生签到信息-->
+    <insert id="save">
+        insert into t_classroom_sign(roomid,userid,createtime,schoolid)
+        values (#{r.roomid},#{r.userid},#{r.createtime},#{r.schoolid})
+    </insert>
 </mapper>
 

sclass/src/main/resources/mapper/room/RoomFileMapper.xml

@@ -1,9 +0,0 @@
-<?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.sclass.mapper.room.RoomFileMapper">
-    <!--保存课堂图片信息-->
-    <insert id="save">
-        insert into t_classroom_file(roomid,rfpath,rftype,createid,createtime,schoolid)
-        values (#{r.roomid},#{r.rfpath},#{r.rftype},#{r.createid},#{r.createtime},#{r.schoolid})
-    </insert>
-</mapper>

sclass/src/main/resources/mapper/room/RoomMapper.xml

@@ -1,271 +0,0 @@
-<?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.sclass.mapper.room.RoomMapper">
-    <!--保存课堂-->
-    <insert id="save">
-        insert into t_classroom(roomid,roomname,classid,roomstate,lsbid,teacherid,directorid
-        ,directortype,classnum,endtime,createid,createtime,schoolid)
-        values
-        (#{r.roomid},#{r.roomname},#{r.classid},#{r.roomstate},#{r.lsbid},#{r.teacherid},#{r.directorid}
-        ,#{r.directortype},#{r.classnum},#{r.endtime},#{r.teacherid},#{r.createtime},#{r.schoolid})
-    </insert>
-    <!--获取班级学生id集合-->
-    <select id="listStudentId" resultType="java.lang.Integer">
-        select cs.studentid from t_class_student cs
-        left join t_classroom r on cs.classid=r.classid
-        where r.roomid=#{roomid};
-    </select>
-    <!--获取批阅信息-->
-    <resultMap id="correctResult" type="com.xhkjedu.sclass.vo.classroom.RoomCorrectVo">
-        <result property="roomid" column="roomid"></result>
-        <result property="roomname" column="roomname"></result>
-        <result property="createtime" column="createtime"></result>
-        <result property="endtime" column="endtime"></result>
-        <result property="classname" column="classname"></result>
-        <result property="gradeid" column="gradeid"></result>
-        <result property="teachername" column="teachername"></result>
-        <collection property="calls" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo"
-                    select="listCall" column="{roomid=roomid,realstunum=realstunum}">
-        </collection>
-        <collection property="exams" ofType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo"
-                    select="listExam" column="{roomid=roomid,realstunum=realstunum}">
-        </collection>
-    </resultMap>
-    <select id="listCall" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectCallVo">
-        select s.asktid,count(*)commitnum,count(*) stunum
-        ,sum(case when s.radiocorrect!=0 then 1 else 0 end)correctnum
-        from t_classroom_askstudent s left join t_classroom_askteacher rt on s.asktid=rt.asktid
-        where rt.roomid=#{roomid} and rt.asktype between 32 and 33
-        group by s.asktid
-    </select>
-    <select id="listExam" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo">
-        select s.paperid,p.papername,count(*)commitnum,count(*) stunum
-        ,sum(case when s.pschecked!=0 then 1 else 0 end)correctnum
-        from t_classroom_paper_student s left join t_classroom_paper p on s.paperid=p.paperid
-        left join t_classroom_askteacher rt on s.paperid=rt.paperid
-        where rt.roomid=#{roomid} and rt.asktype=40
-        group by s.paperid
-    </select>
-    <select id="listCorrect" resultMap="correctResult">
-        select r.roomid,r.roomname,r.createtime,r.endtime,r.realstunum
-        ,c.classname,c.gradeid
-        ,(select u.username  from t_user u where u.userid=r.createid)teachername
-        from t_classroom r left join t_class c on r.classid=c.classid
-        where r.roomid=#{roomid}
-    </select>
-
-    <!--获取提问批改学生列表-->
-    <resultMap id="checkResult" type="com.xhkjedu.sclass.vo.paper.CheckClassVo">
-        <result property="classid" column="classid"></result>
-        <result property="classnum" column="classnum"></result>
-        <result property="ytjnum" column="ytjnum"></result>
-        <result property="ypynum" column="ypynum"></result>
-        <result property="teacherpic" column="teacherpic"></result>
-        <collection property="students" ofType="com.xhkjedu.sclass.vo.paperstudent.StudentVo">
-            <result property="psid" column="psid"></result>
-            <result property="studentid" column="studentid"></result>
-            <result property="studentname" column="studentname"></result>
-            <result property="pschecked" column="pschecked"></result>
-            <result property="studentpic" column="studentpic"></result>
-        </collection>
-    </resultMap>
-    <select id="listStudentsByAskTid" resultMap="checkResult">
-        select rs.classid,rs.asksid psid,rs.studentid,u.username studentname,rs.radiocorrect pschecked,rs.studentpic,rt.teacherpic
-        ,count(rs2.asksid)ytjnum,count(rs2.asksid)classnum
-        ,sum(case when rs2.radiocorrect!=0 then 1 else 0 end)ypynum
-        from t_classroom_askstudent rs left join t_user u on rs.studentid=u.userid
-        left join t_classroom_askteacher rt on rs.asktid=rt.asktid
-        left join t_classroom_askstudent rs2 on rs2.asktid=rs.asktid
-        where rs.asktid=#{asktid}
-        group by rs.asksid
-    </select>
-    <!--获取考试批改学生列表-->
-    <select id="listStudentsByPaperId" resultMap="checkResult">
-        select ps.classid,ps.paperid,ps.psid,ps.studentid,u.username studentname,ps.pschecked
-        ,count(ps2.psid)ytjnum,count(ps2.psid)classnum
-        ,sum(case when ps2.pschecked=1 then 1 else 0 end)ypynum
-        from t_classroom_paper_student ps left join t_user u on ps.studentid=u.userid
-        left join t_classroom_paper_student ps2 on ps2.paperid=ps.paperid
-        where ps.paperid=#{paperid}
-        group by ps.psid
-    </select>
-
-    <resultMap id="objectiveResult" type="com.xhkjedu.sclass.vo.classroom.ObjectiveVo">
-        <result property="typename" column="typename"></result>
-        <result property="answer" column="answer"></result>
-        <result property="correctrate" column="correctrate"></result>
-        <result property="psorder" column="psorder"></result>
-        <result property="psscore" column="psscore"></result>
-        <result property="avgscore" column="avgscore"></result>
-        <result property="maxscore" column="maxscore"></result>
-        <collection property="answers" ofType="com.xhkjedu.sclass.vo.classroom.ObjectiveAnswerVo">
-            <result property="section" column="section"></result>
-            <result property="stunum" column="stunum"></result>
-            <result property="stuscore" column="stuscore"></result>
-            <result property="stuname" column="stuname"></result>
-        </collection>
-    </resultMap>
-    <!--客观题详情-->
-    <select id="callObjective" resultMap="objectiveResult">
-        select (case rt.asktype when 30 then '判断题' when 31 then '选择题' when 32 then '简答题' else '画图题' end )typename
-        ,rt.radioanswer answer,rs.studentradio section,count(*)stunum
-        ,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
-        ,truncate((select sum(case when rs2.radiocorrect=1 then 1 else 0 end)*100/
-        count(*) from t_classroom_askstudent rs2 where rs2.asktid=rt.asktid),2)correctrate
-        from t_classroom_askstudent rs right join t_classroom_askteacher rt on rs.asktid=rt.asktid
-        left join t_user u on rs.studentid=u.userid
-        where rt.asktid=#{asktid}
-        group by rs.studentradio
-    </select>
-    <!--2020.11.16修改，125行添加left-->
-    <select id="examObjective" resultMap="objectiveResult">
-        select ps.ctypename typename,ps.psanswer answer,ps.psorder,ps.psscore
-        ,pss.useranswer section,count(*)stunum,pss.stuscore,a.avgscore,a.maxscore
-        ,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
-        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid
-        left join (select truncate(sum(pss2.stuscore)/(select count(ps2.psid)
-        from t_classroom_paper_student ps2 where ps2.paperid=pss2.paperid),2)avgscore
-        ,max(pss2.stuscore)maxscore,pss2.pscaid
-        FROM t_classroom_paper_student_scantron pss2 WHERE pss2.pscaid=#{pscaid})a on ps.pscaid=a.pscaid
-        left join t_user u on pss.studentid=u.userid
-        where ps.pscaid=#{pscaid}
-        group by pss.useranswer
-    </select>
-
-    <resultMap id="subjectiveResult" type="com.xhkjedu.sclass.vo.classroom.SubjectiveVo">
-        <result property="typename" column="typename"></result>
-        <result property="correctrate" column="correctrate"></result>
-        <result property="psorder" column="psorder"></result>
-        <result property="psscore" column="psscore"></result>
-        <result property="avgscore" column="avgscore"></result>
-        <result property="maxscore" column="maxscore"></result>
-        <collection property="answers" ofType="java.util.Map">
-            <result property="useranswer" column="useranswer"></result>
-            <result property="checked" column="checked"></result>
-            <result property="stuscore" column="stuscore"></result>
-            <result property="stuname" column="stuname"></result>
-        </collection>
-    </resultMap>
-    <!--主观题详情-->
-    <select id="callSubjective" resultMap="subjectiveResult">
-        select (case rt.asktype when 30 then '判断题' when 31 then '选择题' when 32 then '简答题' else '画图题' end )typename
-        ,rs.studentpic useranswer,rs.radiocorrect checked,u.username stuname
-        ,(select ifnull(truncate(sum(case when s.radiocorrect=1 then 1 else 0 end)*100/count(*),2),0)
-        from t_classroom_askstudent s where s.asktid=rt.asktid)correctrate
-        from t_classroom_askstudent rs right join t_classroom_askteacher rt on rs.asktid=rt.asktid
-        left join t_user u on rs.studentid=u.userid
-        where rt.asktid=#{asktid}
-    </select>
-    <select id="examSubjective" resultMap="subjectiveResult">
-        select ps.ctypename typename,ps.psorder,ps.psscore,a.avgscore,a.maxscore
-        ,pss.useranswer,pss.checked,pss.stuscore,u.username stuname
-        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid
-        left join t_user u on pss.studentid=u.userid
-        left join(select truncate(sum(pss1.stuscore)/(select count(ps2.psid)
-        from t_classroom_paper_student ps2 where ps2.paperid=pss1.paperid),2)avgscore
-        ,max(pss1.stuscore)maxscore,pss1.pscaid
-        from t_classroom_paper_student_scantron pss1 where pss1.pscaid=#{pscaid})a on pss.pscaid=a.pscaid
-        where ps.pscaid=#{pscaid}
-    </select>
-
-    <!--课堂提问批阅-->
-    <update id="correctCall">
-        update t_classroom_askstudent set radiocorrect=#{radiocorrect} where asksid=#{asksid}
-    </update>
-    <!--学生课堂回顾列表-->
-    <select id="listStuClass" resultType="com.xhkjedu.sclass.vo.classroom.RoomVo">
-        select r.roomid,r.roomname,r.classid,r.roomstate,r.directorid,r.createtime,r.endtime,r.realstunum,u.username createname
-        ,(select d.directorname from t_director d where d.directorid=r.directorid)directorname
-        from t_classroom r left join t_user u on r.teacherid=u.userid
-        left join t_subject_book sb on r.lsbid=sb.lsbid
-        left join t_class_student cs on r.classid=cs.classid
-        where cs.studentid=#{room.studentid} and sb.subjectid=#{room.subjectid}
-        <if test="room.directorid!=null and room.directorid!='0'.toString() and room.directorid!=''">and r.directorid=#{room.directorid}</if>
-        order by r.createtime desc
-    </select>
-    <!--学生课堂回顾详情-->
-    <resultMap id="stuRoomResult" type="java.util.Map">
-        <result property="roomid" column="roomid"></result>
-        <result property="roomname" column="roomname"></result>
-        <result property="createtime" column="createtime"></result>
-        <result property="endtime" column="endtime"></result>
-        <result property="classnum" column="classnum"></result>
-        <result property="realstunum" column="realstunum"></result>
-        <collection property="questions" ofType="java.util.Map"
-                    select="listStuCall" column="{roomid=roomid,studentid=studentid}">
-        </collection>
-        <collection property="exams" ofType="java.util.Map"
-                    select="listStuExam" column="{roomid=roomid,studentid=studentid,realstunum=realstunum}">
-        </collection>
-        <collection property="asks" ofType="java.util.Map"
-                    select="listStuAsk" column="{roomid=roomid,studentid=studentid}">
-        </collection>
-        <collection property="files" ofType="com.xhkjedu.sclass.model.classroom.TClassroomFile"
-                    select="listFile" column="{roomid=roomid}">
-        </collection>
-    </resultMap>
-    <select id="listFile" resultType="com.xhkjedu.sclass.model.classroom.TClassroomFile">
-        select * from t_classroom_file where roomid=#{roomid}
-    </select>
-    <select id="getReportStu" resultMap="stuRoomResult">
-        select r.roomid,r.roomname,r.endtime,r.createtime,r.classnum,r.realstunum,#{studentid} studentid
-        from t_classroom r where r.roomid=#{roomid} limit 1
-    </select>
-    <select id="listStuCall" resultType="java.util.Map">
-        select rt.asktype,rt.teacherpic,rt.radioanswer,ifnull(s.createtime,0)createtime,s.radiocorrect
-        ,(case when rt.asktype between 32 and 33 then s.studentpic else s.studentradio end)useranswer
-        ,(select ifnull(truncate(sum(case when s1.radiocorrect=1 then 1 else 0 end)*100/count(*),2),0)
-        from t_classroom_askstudent s1 where s1.asktid=rt.asktid)correctrate
-        from t_classroom_askstudent s right join t_classroom_askteacher rt on s.asktid=rt.asktid and s.studentid=#{studentid}
-        where rt.roomid=#{roomid} and rt.asktype between 30 and 33
-        group by rt.asktid
-    </select>
-    <select id="listStuAsk" resultType="java.util.Map">
-        select a.asktype,a.fqnum,a.cynum,truncate(a.cynum*100/a.fqnum,2)cyrate
-        from(select rt.asktype,count(distinct rt.asktid)fqnum,(select count(*) from t_classroom_askstudent s1
-        left join t_classroom_askteacher rt1 on s1.asktid=rt1.asktid
-        where rt1.roomid=rt.roomid and rt1.asktype=rt.asktype and s1.studentid=#{studentid})cynum
-        from t_classroom_askstudent s right join t_classroom_askteacher rt on s.asktid=rt.asktid
-        where rt.roomid=#{roomid} and rt.asktype between 20 and 21
-        group by rt.asktype)a
-    </select>
-    <resultMap id="stuExamResult" type="java.util.Map">
-        <result property="paperid" column="paperid"></result>
-        <result property="papername" column="papername"></result>
-        <result property="papernum" column="papernum"></result>
-        <result property="paperscore" column="paperscore"></result>
-        <result property="avgscore" column="avgscore"></result>
-        <result property="maxscore" column="maxscore"></result>
-        <result property="scorerate" column="scorerate"></result>
-        <result property="stuscore" column="stuscore"></result>
-        <collection property="files" ofType="java.lang.String"
-                    select="listStuEFile" column="{paperid=paperid}">
-        </collection>
-        <collection property="questions" ofType="java.util.Map"
-                    select="listStuEQuestion" column="{paperid=paperid,studentid=studentid,realstunum=realstunum}">
-        </collection>
-    </resultMap>
-    <select id="listStuEFile" resultType="java.lang.String">
-        select filepath from t_classroom_paper_file where paperid=#{paperid} order by fileorder
-    </select>
-    <select id="listStuExam" resultMap="stuExamResult">
-        select p.paperid,p.papername,p.papernum,p.paperscore
-        ,(select ifnull(truncate(sum(s.stuscore)/(count(s.psid)*s.paperscore),2),0))avgscore
-        ,(select ifnull(max(s.stuscore),0))maxscore
-        ,ifnull(truncate(s1.stuscore*100/p.paperscore,2),0)scorerate,ifnull(s1.stuscore,0)stuscore,s1.psid
-        ,#{studentid} studentid,count(s.psid) realstunum
-        from t_classroom_paper p right join t_classroom_askteacher rt on p.paperid=rt.paperid
-        left join t_classroom_paper_student s on s.paperid=p.paperid
-        left join t_classroom_paper_student s1 on s1.paperid=rt.paperid and s1.studentid=#{studentid}
-        where rt.roomid=#{roomid} and rt.asktype=40 and p.paperid is not null
-        group by p.paperid
-    </select>
-    <select id="listStuEQuestion" resultType="java.util.Map">
-        select ps.pscaid,ps.psorder,ps.ctypename,ps.ctype,ps.psscore,ps.psanswer,ifnull(pss.stuscore,0)stuscore,pss.useranswer
-        ,ifnull(truncate(pss.stuscore*100/pss.qscore,2),0)scorerate
-        ,ifnull(truncate(sum(pss1.stuscore)/#{realstunum},2),0)avgscore,ifnull(max(pss1.stuscore),0)maxscore
-        from t_classroom_paper_scantron ps left join t_classroom_paper_student_scantron pss1 on ps.pscaid=pss1.pscaid
-        left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid and pss.studentid=#{studentid}
-        where ps.paperid=#{paperid} group by ps.pscaid
-    </select>
-</mapper>

sclass/src/main/resources/mapper/room/RoomSignMapper.xml

@@ -1,10 +0,0 @@
-<?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.sclass.mapper.room.RoomSignMapper">
-    <!--保存学生签到信息-->
-    <insert id="save">
-        insert into t_classroom_sign(roomid,userid,createtime,schoolid)
-        values (#{r.roomid},#{r.userid},#{r.createtime},#{r.schoolid})
-    </insert>
-</mapper>
-