diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 28d941edf98d41275f917d277da1f9a92dc2d93b..46754baa5f58b5488171d057b342bda710a31257 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,8 +9,17 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fly_check/fly_check.iml b/fly_check/fly_check.iml
index 4cf874dc27483247d41027c582c18ed7506e86e6..5f2729c0cc1e2912cff09dbb58085f44ce3634cc 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 4cf874dc27483247d41027c582c18ed7506e86e6..08f236fa658d9bf7a0d9ab7fdc25ecb5e917ceda 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 74f3f131c13b467c7040d951529e88bfcc393a21..b7cdba783fc4f1177d19ec65d68da5a3297aa9a5 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_homework/fly_homework.iml b/fly_homework/fly_homework.iml
index 8c7d5259edafc9afd17a06064bc410e2592fa582..5f2729c0cc1e2912cff09dbb58085f44ce3634cc 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 23babd71f2cb0bf4c1e94a53debaf9a94ad27b71..bbc87caa7aa425ce912285dd027ed6a3c31091d7 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,19 +38,78 @@ 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}/{sname}","/grade/{tid}/{gid}","/stu/{tid}/{sname}"})
+ public Result findAllExam(@PathVariable Integer tid,
+ @PathVariable(required = false) Integer gid,
+ @PathVariable(required = false) String sname) {
+ TreeSet grades = null;
+ List students = null;
+ List exams = null;
+ if (gid == null && sname == 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,sname);
+ }
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);
}
+
+ /**
+ * 班级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/controller/HomeworkController.java b/fly_homework/src/main/java/com/zhiyou/homework/controller/HomeworkController.java
index 9233bf562dc3edf1398133119aba94b60985d99c..878545f104e1e7434ab53a953e2c5b191190ef96 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;
@@ -49,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,"作业发布成功");
}
@@ -133,19 +132,62 @@ 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}/{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,cid,gid,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 4e36c23620db4096b30f95b6fb7de378635c857d..2b269687c568601c35e3c58d71cfb73756c1b705 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,7 +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(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/dao/HomeworkDao.java b/fly_homework/src/main/java/com/zhiyou/homework/dao/HomeworkDao.java
index a08fd3cb9f2f4154674cbc860033b0ec96a07308..cd572473f845d51ffc5eab5d111344751353c38f 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 f6b69890a4a3ad2e3571485c0719279a6509262e..69541cdbb331aa5cbb9fce92a527b1a380389c31 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 1b3f10c8c25cc3d038ac5cfc862041d9bb122e0b..760ca3352c7b95ed36bf1c715f98529ffdd4ee09 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/pojo/Homework.java b/fly_homework/src/main/java/com/zhiyou/homework/pojo/Homework.java
index 3ae441bc685704e81f8874eee590c6324c97973f..82e1975948d743993c33f6cdb28b27c2d0e0d99f 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 5144e68a1a2ccf0444e931d049a13f0aee4ca54e..c9fd1e9ff440cec25017208a5efb0ac64cdcba5a 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/ExamService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/ExamService.java
index 6c29539b9de71b6fccfaf22ae09ff7b6d8bf7a0e..7fe78a93f4b59f5c9be5b89445a04fd4f61cea3e 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 {
/**
@@ -11,4 +12,12 @@ public interface ExamService {
* @return
*/
public List findAllByGid(Integer gid) ;
+
+ 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/HomeworkService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/HomeworkService.java
index 0d8359787eccdbc90a069617b68120d2285b2054..2d4e1feec5a18190b11e7664d1f3b06d4ec2ca07 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/ParentService.java b/fly_homework/src/main/java/com/zhiyou/homework/service/ParentService.java
index b33f524d916a106ce795045c1efbdf0ec94241d5..c47979a9ba5c1956b6a22a795c4688a15647610a 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 49a9e65d292668850d3c9cb0866d2a860a48e854..306eac8bf4a51463c47957217422a1da426f54fe 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,Integer cid,Integer gid,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 86a6a5144330e5aac29cb2129aaa46a1b37330b6..7e36fe46a8efeda0fed5661ee5f054e484f1a889 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 758942cb21746639e18633fbcde100f79f86ca1c..3f4abdba7c595384c26c965578e121bcd53533c7 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) {
@@ -21,4 +29,36 @@ public class ExamServiceImpl implements ExamService {
List exams = examDao.select(exam);
return exams;
}
+
+ @Override
+ public List findStuAll(Integer gid,String sname) {
+ // sname==null 即查全部
+ if (sname != null){
+ List exams = examDao.findStuAll(sname);
+ return exams;
+ } else {
+ Exam exam = new Exam();
+ exam.setGid(gid);
+ List exams = examDao.select(exam);
+ 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);
+ }
+
+
}
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 3afff4a282181c641f9b47241c84a39f3439e735..c2d7284bffac23c678fcf5921166860fed90a128 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);
}
}
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 1205499ae0e330a28953f674d89138b0300fc0e6..04c035043e9e174768f1367349009106f65d9b2b 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 9367f5cfba08d80668c1c65bba0bb2e7fa7e00ac..ac22617e70c0446fd1775ff6ad0ae1f789f96feb 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 d15d8a56da200a51bbc04f412d00346ac9ff317e..2508d9fbcee95cd2eb3fe992620e3901e009666e 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
diff --git a/fly_videoMonitoring/fly_videoMonitoring.iml b/fly_videoMonitoring/fly_videoMonitoring.iml
index 4cf874dc27483247d41027c582c18ed7506e86e6..5f2729c0cc1e2912cff09dbb58085f44ce3634cc 100644
--- a/fly_videoMonitoring/fly_videoMonitoring.iml
+++ b/fly_videoMonitoring/fly_videoMonitoring.iml
@@ -5,4 +5,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e023d01be90f322235780ca1ca70765644415da6..ca2e07f2e85462e643424056ad7cbcf1db8c8077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
fly_common
fly_videoMonitoring
fly_check
+ fly_homework