From 8cee84b59127257b48ca185621bb8678e9304f42 Mon Sep 17 00:00:00 2001 From: qiushiju Date: Fri, 21 Aug 2020 18:06:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?2020-08-21=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fly_homework/fly_homework.iml | 11 ---- .../controller/ExamScoreController.java | 44 ++++++++++--- .../controller/HomeworkController.java | 66 +++++++++++++++---- .../java/com/zhiyou/homework/dao/ExamDao.java | 3 + .../com/zhiyou/homework/dao/HomeworkDao.java | 6 +- .../com/zhiyou/homework/dao/StudentDao.java | 8 +++ .../homework/dao/StudentHomeworkDao.java | 2 + .../zhiyou/homework/service/ExamService.java | 2 + .../homework/service/ParentService.java | 10 +++ .../service/StudentHomeworkService.java | 19 ++++++ .../homework/service/TeacherService.java | 2 + .../service/impl/ExamServiceImpl.java | 14 ++++ .../service/impl/TeacherServiceImpl.java | 16 +++++ .../src/main/resources/application.yml | 2 +- .../mapper/StudentHomeworkMapper.xml | 20 ++++++ 15 files changed, 188 insertions(+), 37 deletions(-) diff --git a/fly_homework/fly_homework.iml b/fly_homework/fly_homework.iml index 8c7d525..5f2729c 100644 --- a/fly_homework/fly_homework.iml +++ b/fly_homework/fly_homework.iml @@ -4,17 +4,6 @@ - - - - - - - - - - - diff --git a/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java b/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java index 23babd7..c9bf9e8 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java @@ -2,9 +2,12 @@ package com.zhiyou.homework.controller; import com.zhiyou.common.pojo.Result; import com.zhiyou.common.pojo.StateCode; +import com.zhiyou.homework.dao.StudentDao; import com.zhiyou.homework.pojo.Exam; import com.zhiyou.homework.pojo.Grade; +import com.zhiyou.homework.pojo.Student; import com.zhiyou.homework.service.ExamService; +import com.zhiyou.homework.service.StudentService; import com.zhiyou.homework.service.TeacherService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -24,6 +27,9 @@ public class ExamScoreController { @Autowired private ExamService examService; + @Autowired + private StudentService studentService; + /** * 打开成绩管理首页 @@ -32,18 +38,36 @@ public class ExamScoreController { * 接口测试OK * TODO 原型图展示的是xxx成绩单,这里数据存储查出都是xxx考试 */ - @GetMapping("/{tid}") - public Result findAllExam(@PathVariable Integer tid) { - // 查询老师所教所有班级,且按班级编号降序 - Map gradeCourseMap = teacherService.findGradeAndCourseByTeacherId(tid); - TreeSet gradeSet = gradeCourseMap.get("grade"); - // 获得第一个班级 - Grade firstGrade = (Grade)gradeSet.first(); - // 获得该班所有考试信息 - List exams = examService.findAllByGid(firstGrade.getGid()); + @GetMapping({"/{tid}","/{tid}/{gid}/{sid}"}) + public Result findAllExam(@PathVariable Integer tid, + @PathVariable(required = false) Integer gid, + @PathVariable(required = false) Integer sid) { + TreeSet grades = null; + List students = null; + List exams = null; + if (gid == null && sid == null) { + // 查询老师所教所有班级,且按班级编号降序 + Map gradeCourseMap = teacherService.findGradeAndCourseByTeacherId(tid); + grades = gradeCourseMap.get("grade"); + // 获得第一个班级 + Grade firstGrade = (Grade)grades.first(); + // 获得该班所有学生信息 + students = studentService.select(firstGrade.getGid()); + // 获得该班所有考试信息 + exams = examService.findAllByGid(firstGrade.getGid()); + + }else { + // 获得所有班级信息 + grades = teacherService.findAllGrade(tid); + // 获得该班所有学生信息 + students = studentService.select(gid); + // 获得该学生所有考试 + exams = examService.findStuAll(gid,sid); + } Map map = new HashMap<>(); - map.put("grade",gradeSet); + map.put("grade",grades); map.put("exam",exams); + map.put("students",students); return new Result(true, StateCode.OK,"查询全部考试成功",map); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java b/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java index 9233bf5..5a90eac 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java @@ -23,9 +23,6 @@ public class HomeworkController { @Autowired private HomeworkService homeworkService; - @Autowired - private ParentService parentService; - @Autowired private StudentHomeworkService stuHwService; @@ -133,19 +130,60 @@ public class HomeworkController { } /** - * 家长端查看全部作业 + * 家长端: 查看全部作业 * @param pid 家长id * @param releaseTime 发布作业时间 + * 接口测试OK + */ + @GetMapping("/parent/{pid}/{releaseTime}") + public Result parentFindAllHw(@PathVariable Integer pid, + @PathVariable String releaseTime) { + + List> list = stuHwService.findAllHw(pid,releaseTime); + return new Result(true, StateCode.OK,"查询孩子学生全部科目作业",list); + + } + + /** + * 家长端 : 查询作业详情 */ -// @GetMapping("/parent/{pid}/{releaseTime}") -// public Result parentFindAllHw(@PathVariable Integer pid, -// @PathVariable String releaseTime) { -// -// List students = parentService.findAllStu(pid); -// -// Map map = stuHwService.findAllHw(students); -// return new Result(true, StateCode.OK,"查询孩子学生全部科目作业",map); -// -// } + @GetMapping("/parent/{sid}/{cid}/{tid}/{releaseTime}") + public Result parentFindOneHw(@PathVariable Integer sid, + @PathVariable Integer cid, + @PathVariable Integer tid, + @PathVariable String releaseTime) { + + Map map = stuHwService.findOneHw(sid,cid,tid,releaseTime); + return new Result(true, StateCode.OK,"查询孩子学生科目作业",map); + + } + + + /** + * 家长端:上传作业 图片+视频 + * 接口测试OK + */ + @PostMapping("/parent/upload") + public Result parentSubmitHomeworkImgOrVideo(@PathVariable("file") MultipartFile file) { + return stuHwService.submitHomeworkImgOrVideo(file); + } + + /** + * 家长端 : 上传学生作业 + */ + @PostMapping("/parent/{sid}/{tid}/{releaseTime}") + public Result parentSubmitHw(@PathVariable Integer tid, + @PathVariable Integer sid, + @PathVariable String releaseTime, + @RequestParam(required = false,defaultValue = "") String content, + @RequestParam(required = false,defaultValue = "") String url) { + + + stuHwService.submitHomework(sid,tid,releaseTime,content,url); + + return new Result(true, StateCode.OK,"提交学生作业"); + + } + } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java index 4e36c23..440cf35 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java @@ -3,5 +3,8 @@ package com.zhiyou.homework.dao; import com.zhiyou.homework.pojo.Exam; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface ExamDao extends Mapper{ + List findStuAll(Integer sid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/dao/HomeworkDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/HomeworkDao.java index a08fd3c..cd57247 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/dao/HomeworkDao.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/dao/HomeworkDao.java @@ -1,10 +1,14 @@ package com.zhiyou.homework.dao; import com.zhiyou.homework.pojo.Homework; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; -public interface HomeworkDao extends Mapper { +import java.util.List; +import java.util.Map; +public interface HomeworkDao extends Mapper { + List> selectHomeworBySidAndRelasetime(@Param("pid") Integer pid, @Param("releaseTime") String releaseTime); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentDao.java index f6b6989..69541cd 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentDao.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentDao.java @@ -1,7 +1,15 @@ package com.zhiyou.homework.dao; import com.zhiyou.homework.pojo.Student; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; +import java.util.Map; + public interface StudentDao extends Mapper{ + + List selectByParentId(Integer pid); + + Map selectStuentBySid(@Param("sid") Integer sid, @Param("cid") Integer cid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentHomeworkDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentHomeworkDao.java index 1b3f10c..760ca33 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentHomeworkDao.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/dao/StudentHomeworkDao.java @@ -1,6 +1,7 @@ package com.zhiyou.homework.dao; import com.zhiyou.homework.pojo.StudentHomework; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; import java.util.Map; @@ -10,4 +11,5 @@ public interface StudentHomeworkDao extends Mapper{ int updateHomeworkstatus(Map paramMap); + Map selectHomeworkBySid(@Param("sid") Integer sid, @Param("tid") Integer tid,@Param("releaseTime") String releaseTime); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java index 6c29539..1476819 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java @@ -11,4 +11,6 @@ public interface ExamService { * @return */ public List findAllByGid(Integer gid) ; + + List findStuAll(Integer gid,Integer sid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/ParentService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/ParentService.java index b33f524..c47979a 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/ParentService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/ParentService.java @@ -1,4 +1,14 @@ package com.zhiyou.homework.service; +import com.zhiyou.homework.pojo.Student; + +import java.util.List; + public interface ParentService { + /** + * 根据家长id查询全部学生 + * @param pid + * @return + */ + List findAllStu(Integer pid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java index 49a9e65..7a230fc 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java @@ -1,4 +1,23 @@ package com.zhiyou.homework.service; +import com.zhiyou.common.pojo.Result; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + public interface StudentHomeworkService { + /** + * 家长查询老师发布作业 + * @param pid 家长id + * @param releaseTime + * @return + */ + List> findAllHw(Integer pid, String releaseTime); + + Map findOneHw(Integer sid,Integer cid,Integer tid, String releaseTime); + + Result submitHomeworkImgOrVideo(MultipartFile file); + + void submitHomework(Integer sid, Integer tid,String releaseTime, String content, String url); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/TeacherService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/TeacherService.java index 86a6a51..7e36fe4 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/TeacherService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/TeacherService.java @@ -46,4 +46,6 @@ public interface TeacherService { * @return */ Result releaseHomeworkImgOrVideo(MultipartFile file); + + TreeSet findAllGrade(Integer tid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java index 758942c..b411eaf 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java @@ -21,4 +21,18 @@ public class ExamServiceImpl implements ExamService { List exams = examDao.select(exam); return exams; } + + @Override + public List findStuAll(Integer gid,Integer sid) { + // sid=0 即查全部 + if (sid != 0){ + List exams = examDao.findStuAll(sid); + return exams; + } else { + Exam exam = new Exam(); + exam.setGid(gid); + List exams = examDao.select(exam); + return exams; + } + } } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/TeacherServiceImpl.java b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/TeacherServiceImpl.java index 1205499..04c0350 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/TeacherServiceImpl.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/TeacherServiceImpl.java @@ -197,5 +197,21 @@ public class TeacherServiceImpl implements TeacherService { } } + @Override + public TreeSet findAllGrade(Integer tid) { + // 存放查出的班级信息 + TreeSet gradeSet = new TreeSet<>(new GradeCompare()); + // 根据tid查询班级科目表 + GradeCourse gradeCourseObj = new GradeCourse(); + gradeCourseObj.setTid(tid); + List gradeCourseList = gradeCourseDao.select(gradeCourseObj); + for (GradeCourse gradeCourse : gradeCourseList) { + // 得到每个班级编号,再查班级信息 + Grade grade = gradeDao.selectByPrimaryKey(gradeCourse.getGid()); + gradeSet.add(grade); + } + return gradeSet; + } + } diff --git a/fly_homework/src/main/resources/application.yml b/fly_homework/src/main/resources/application.yml index 9367f5c..ac22617 100644 --- a/fly_homework/src/main/resources/application.yml +++ b/fly_homework/src/main/resources/application.yml @@ -19,4 +19,4 @@ mybatis: ## mapper 控制台显示sql语句 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl ## 使用类名别名 - type-aliases-package: com.zhiyou100.model \ No newline at end of file + type-aliases-package: com.zhiyou.homework.pojo \ No newline at end of file diff --git a/fly_homework/src/main/resources/mapper/StudentHomeworkMapper.xml b/fly_homework/src/main/resources/mapper/StudentHomeworkMapper.xml index d15d8a5..2508d9f 100644 --- a/fly_homework/src/main/resources/mapper/StudentHomeworkMapper.xml +++ b/fly_homework/src/main/resources/mapper/StudentHomeworkMapper.xml @@ -12,4 +12,24 @@ AND shsubtime LIKE '${subTime}%'; + + \ No newline at end of file -- Gitee From 9246d3f01a5962abf71449b4c10f5344274eb41a Mon Sep 17 00:00:00 2001 From: qiushiju Date: Fri, 21 Aug 2020 18:09:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?2020-08-21=20=E6=8F=90=E4=BA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 6 ++++++ pom.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/.idea/misc.xml b/.idea/misc.xml index 651d441..4470782 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,6 +10,12 @@ + diff --git a/pom.xml b/pom.xml index e023d01..ca2e07f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ fly_common fly_videoMonitoring fly_check + fly_homework -- Gitee From ca0f8976ea257b564696d264536f878ea37a9381 Mon Sep 17 00:00:00 2001 From: qiushiju Date: Mon, 24 Aug 2020 08:51:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?2020-08-24=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 9 +++ .idea/misc.xml | 6 -- fly_check/fly_check.iml | 82 +++++++++++++++++++++ fly_common/fly_common.iml | 65 ++++++++++++++++ fly_elephant.iml | 67 ++++++++++++++++- fly_videoMonitoring/fly_videoMonitoring.iml | 82 +++++++++++++++++++++ 6 files changed, 304 insertions(+), 7 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 28d941e..46754ba 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,8 +9,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 70b0a42..6966647 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,12 +11,6 @@ - diff --git a/fly_check/fly_check.iml b/fly_check/fly_check.iml index 4cf874d..5f2729c 100644 --- a/fly_check/fly_check.iml +++ b/fly_check/fly_check.iml @@ -5,4 +5,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fly_common/fly_common.iml b/fly_common/fly_common.iml index 4cf874d..08f236f 100644 --- a/fly_common/fly_common.iml +++ b/fly_common/fly_common.iml @@ -5,4 +5,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fly_elephant.iml b/fly_elephant.iml index 74f3f13..b7cdba7 100644 --- a/fly_elephant.iml +++ b/fly_elephant.iml @@ -1,2 +1,67 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fly_videoMonitoring/fly_videoMonitoring.iml b/fly_videoMonitoring/fly_videoMonitoring.iml index 4cf874d..5f2729c 100644 --- a/fly_videoMonitoring/fly_videoMonitoring.iml +++ b/fly_videoMonitoring/fly_videoMonitoring.iml @@ -5,4 +5,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- Gitee From f6c14fd32a64cdb7d19261877313501eab5d7bd2 Mon Sep 17 00:00:00 2001 From: qiushiju Date: Wed, 16 Sep 2020 17:14:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?2020-09-16=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExamScoreController.java | 49 +++++++++++++++++-- .../java/com/zhiyou/homework/dao/ExamDao.java | 10 +++- .../zhiyou/homework/service/ExamService.java | 9 +++- .../service/impl/ExamServiceImpl.java | 34 +++++++++++-- 4 files changed, 92 insertions(+), 10 deletions(-) diff --git a/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java b/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java index c9bf9e8..bbc87ca 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/controller/ExamScoreController.java @@ -38,14 +38,14 @@ public class ExamScoreController { * 接口测试OK * TODO 原型图展示的是xxx成绩单,这里数据存储查出都是xxx考试 */ - @GetMapping({"/{tid}","/{tid}/{gid}/{sid}"}) + @GetMapping({"/{tid}","/{tid}/{gid}/{sname}","/grade/{tid}/{gid}","/stu/{tid}/{sname}"}) public Result findAllExam(@PathVariable Integer tid, @PathVariable(required = false) Integer gid, - @PathVariable(required = false) Integer sid) { + @PathVariable(required = false) String sname) { TreeSet grades = null; List students = null; List exams = null; - if (gid == null && sid == null) { + if (gid == null && sname == null) { // 查询老师所教所有班级,且按班级编号降序 Map gradeCourseMap = teacherService.findGradeAndCourseByTeacherId(tid); grades = gradeCourseMap.get("grade"); @@ -62,7 +62,7 @@ public class ExamScoreController { // 获得该班所有学生信息 students = studentService.select(gid); // 获得该学生所有考试 - exams = examService.findStuAll(gid,sid); + exams = examService.findStuAll(gid,sname); } Map map = new HashMap<>(); map.put("grade",grades); @@ -71,4 +71,45 @@ public class ExamScoreController { return new Result(true, StateCode.OK,"查询全部考试成功",map); } + + /** + * 班级id+根据考试id 查询该班考试详情及该班所有学生所有学科成绩 + */ + @GetMapping("/detail/{gid}/{eid}") + public Result findAllExam(@PathVariable Integer gid, + @PathVariable Integer eid) { + + // 先查询班级整体情况 + List> gradeExamInfo = examService.findGradeExamInfo(gid,eid); + + // 再查询全部所有学生所有学科成绩 + List> gradeAllStuExamInfo = examService.findGradeAllStuExamInfo(gid); + Map>> result = new HashMap<>(); + result.put("gInfo",gradeExamInfo); + result.put("gsInfo",gradeAllStuExamInfo); + return new Result(true, StateCode.OK,"查询单个考试成功",result); + } + + /** + * 家长端:查询学生考试详情 + */ + @GetMapping("/parent/detail/{sid}") + public Result parentFindAllExam(@PathVariable Integer sid) { + + // 学生姓名 + Student student = studentService.selectByPrimaryKey(sid); + + // 该生参加的所有考试 + List exams = examService.findStuAll(student.getSgid(),student.getSname()); + // 最近一次考试的考试成绩 + Map examInfo = examService.findOneExamInfo(sid,exams.get(0).getEid()); + + Map result = new HashMap<>(); + result.put("sname",student.getSname()); + result.put("exams",exams); + result.put("examInfo",examInfo); + + return new Result(true, StateCode.OK,"查询单个考试成功",result); + } + } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java index 440cf35..2b26968 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/dao/ExamDao.java @@ -1,10 +1,18 @@ package com.zhiyou.homework.dao; import com.zhiyou.homework.pojo.Exam; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; import java.util.List; +import java.util.Map; public interface ExamDao extends Mapper{ - List findStuAll(Integer sid); + List findStuAll(String sname); + + List> findGradeExamInfo(@Param("gid") Integer gid, @Param("eid") Integer eid); + + List> findGradeAllStuExamInfo(Integer gid); + + Map findOneExamInfo(@Param("sid")Integer sid, @Param("eid")Integer eid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java index 1476819..7fe78a9 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java @@ -3,6 +3,7 @@ package com.zhiyou.homework.service; import com.zhiyou.homework.pojo.Exam; import java.util.List; +import java.util.Map; public interface ExamService { /** @@ -12,5 +13,11 @@ public interface ExamService { */ public List findAllByGid(Integer gid) ; - List findStuAll(Integer gid,Integer sid); + List findStuAll(Integer gid,String sname); + + List> findGradeExamInfo(Integer gid, Integer eid); + + List> findGradeAllStuExamInfo(Integer gid); + + Map findOneExamInfo(Integer sid, Integer eid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java index b411eaf..3f4abdb 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/ExamServiceImpl.java @@ -1,18 +1,26 @@ package com.zhiyou.homework.service.impl; +import com.zhiyou.homework.dao.CourseDao; import com.zhiyou.homework.dao.ExamDao; +import com.zhiyou.homework.pojo.Course; import com.zhiyou.homework.pojo.Exam; import com.zhiyou.homework.service.ExamService; +import org.omg.CORBA.OBJ_ADAPTER; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; + @Service public class ExamServiceImpl implements ExamService { @Autowired private ExamDao examDao; + @Autowired + private CourseDao courseDao; + @Override public List findAllByGid(Integer gid) { @@ -23,10 +31,10 @@ public class ExamServiceImpl implements ExamService { } @Override - public List findStuAll(Integer gid,Integer sid) { - // sid=0 即查全部 - if (sid != 0){ - List exams = examDao.findStuAll(sid); + public List findStuAll(Integer gid,String sname) { + // sname==null 即查全部 + if (sname != null){ + List exams = examDao.findStuAll(sname); return exams; } else { Exam exam = new Exam(); @@ -35,4 +43,22 @@ public class ExamServiceImpl implements ExamService { return exams; } } + + @Override + public List> findGradeExamInfo(Integer gid, Integer eid) { + return examDao.findGradeExamInfo(gid,eid); + } + + @Override + public List> findGradeAllStuExamInfo(Integer gid) { + List> gradeAllStuExamInfo = examDao.findGradeAllStuExamInfo(gid); + return gradeAllStuExamInfo; + } + + @Override + public Map findOneExamInfo(Integer sid, Integer eid) { + return examDao.findOneExamInfo(sid,eid); + } + + } -- Gitee From 149cfc520df02fa0fdd2cf68a961dd7ce70e8721 Mon Sep 17 00:00:00 2001 From: qiushiju Date: Tue, 3 Nov 2020 15:50:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=AE=B6=E9=95=BF=E6=8F=90=E4=BA=A4=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HomeworkController.java | 18 ++++++++++------- .../com/zhiyou/homework/pojo/Homework.java | 20 +++++++++++++++++++ .../zhiyou/homework/pojo/StudentHomework.java | 20 +++++++++++++++++++ .../homework/service/HomeworkService.java | 2 +- .../service/StudentHomeworkService.java | 2 +- .../service/impl/HomeworkServiceImpl.java | 4 +++- 6 files changed, 56 insertions(+), 10 deletions(-) diff --git a/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java b/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java index 5a90eac..878545f 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java @@ -46,11 +46,13 @@ public class HomeworkController { * 接口测试OK * TODO 作业内容和url是以form表单发送? json格式发送? */ - @PostMapping("/release/{tid}") + @PostMapping("/release/{tid}/{cid}/{gid}") public Result releaseHomework(@PathVariable Integer tid, String content, - @RequestParam(required = false,defaultValue = "") String url) { - homeworkService.insertHomework(tid,content,url); + @RequestParam(required = false,defaultValue = "") String url, + @PathVariable Integer cid, + @PathVariable Integer gid) { + homeworkService.insertHomework(tid,content,url,cid,gid); return new Result(true, StateCode.OK,"作业发布成功"); } @@ -171,15 +173,17 @@ public class HomeworkController { /** * 家长端 : 上传学生作业 */ - @PostMapping("/parent/{sid}/{tid}/{releaseTime}") - public Result parentSubmitHw(@PathVariable Integer tid, - @PathVariable Integer sid, + @PostMapping("/parent/{sid}/{tid}/{cid}/{gid}/{releaseTime}") + public Result parentSubmitHw(@PathVariable Integer sid, + @PathVariable Integer tid, + @PathVariable Integer cid, + @PathVariable Integer gid, @PathVariable String releaseTime, @RequestParam(required = false,defaultValue = "") String content, @RequestParam(required = false,defaultValue = "") String url) { - stuHwService.submitHomework(sid,tid,releaseTime,content,url); + stuHwService.submitHomework(sid,tid,cid,gid,releaseTime,content,url); return new Result(true, StateCode.OK,"提交学生作业"); diff --git a/fly_homework/src/main/java/com/zhiyou/homework/pojo/Homework.java b/fly_homework/src/main/java/com/zhiyou/homework/pojo/Homework.java index 3ae441b..82e1975 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/pojo/Homework.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/pojo/Homework.java @@ -10,6 +10,10 @@ public class Homework { private Integer htid; + private Integer hgid; + + private Integer hcid; + private Date hreleasetime; private String hreleasecontent; @@ -34,6 +38,22 @@ public class Homework { this.htid = htid; } + public Integer getHgid() { + return hgid; + } + + public void setHgid(Integer hgid) { + this.hgid = hgid; + } + + public Integer getHcid() { + return hcid; + } + + public void setHcid(Integer hcid) { + this.hcid = hcid; + } + public Date getHreleasetime() { return hreleasetime; } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/pojo/StudentHomework.java b/fly_homework/src/main/java/com/zhiyou/homework/pojo/StudentHomework.java index 5144e68..c9fd1e9 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/pojo/StudentHomework.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/pojo/StudentHomework.java @@ -9,6 +9,10 @@ public class StudentHomework { private Integer shtid; + private Integer shcid; + + private Integer shgid; + private Integer shstatus; private Date shsubtime; @@ -53,6 +57,22 @@ public class StudentHomework { this.shtid = shtid; } + public Integer getShcid() { + return shcid; + } + + public void setShcid(Integer shcid) { + this.shcid = shcid; + } + + public Integer getShgid() { + return shgid; + } + + public void setShgid(Integer shgid) { + this.shgid = shgid; + } + public Integer getShstatus() { return shstatus; } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/HomeworkService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/HomeworkService.java index 0d83597..2d4e1fe 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/HomeworkService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/HomeworkService.java @@ -8,5 +8,5 @@ public interface HomeworkService { * @param content * @param url */ - void insertHomework(int tid, String content, String url); + void insertHomework(int tid, String content, String url,int cid,int gid); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java index 7a230fc..306eac8 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/StudentHomeworkService.java @@ -19,5 +19,5 @@ public interface StudentHomeworkService { Result submitHomeworkImgOrVideo(MultipartFile file); - void submitHomework(Integer sid, Integer tid,String releaseTime, String content, String url); + void submitHomework(Integer sid, Integer tid,Integer cid,Integer gid,String releaseTime, String content, String url); } diff --git a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/HomeworkServiceImpl.java b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/HomeworkServiceImpl.java index 3afff4a..c2d7284 100644 --- a/fly_homework/src/main/java/com/zhiyou/homework/service/impl/HomeworkServiceImpl.java +++ b/fly_homework/src/main/java/com/zhiyou/homework/service/impl/HomeworkServiceImpl.java @@ -20,13 +20,15 @@ public class HomeworkServiceImpl implements HomeworkService { * @param url */ @Override - public void insertHomework(int tid, String content, String url) { + public void insertHomework(int tid, String content, String url,int cid,int gid) { Homework homework = new Homework(); homework.setHreleasecontent(content); homework.setHreleaseimg(url); homework.setHreleasevideo(url); homework.setHtid(tid); homework.setHreleasetime(new Date()); + homework.setHcid(cid); + homework.setHgid(gid); homeworkDao.insert(homework); } } -- Gitee