From 83b2ad34f990c9e60d38c2a4170a82d9ed649324 Mon Sep 17 00:00:00 2001 From: bin <1178635798@qq.com> Date: Mon, 17 Mar 2025 14:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=AE=A1=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/action/ToolTemplateAction.java | 119 ++++++++++-------- .../wetoband/template/dao/HomeWorkDao.java | 3 +- .../com/wetoband/template/dao/SubmitDao.java | 7 +- .../template/dao/impl/HomeWorkDaoImpl.java | 94 ++++++++++++-- .../template/dao/impl/SubmitDaoImpl.java | 43 ++++++- .../com/wetoband/template/entity/Student.java | 17 +++ .../template/service/HomeWorkService.java | 4 +- .../template/service/SubmitService.java | 4 +- .../service/impl/HomeWorkServiceImpl.java | 10 +- .../service/impl/SubmitServiceImpl.java | 17 ++- .../target/classes/config.properties | 2 +- HomeWork-java/tempResources/config.properties | 2 +- TeacherHomeWork-vite/src/router/index.js | 5 +- .../views/GradeHomework/GradeHomeworkList.vue | 71 ++++++++--- .../views/HomeWorkManager/HomeworkList.vue | 92 ++++++++++++-- 15 files changed, 378 insertions(+), 112 deletions(-) create mode 100644 HomeWork-java/src/com/wetoband/template/entity/Student.java diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index 65c71bd..5520ddc 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -21,17 +21,17 @@ import java.util.*; public class ToolTemplateAction extends ActionToolBase { public final static ApplicationContext IOC = AppConfig.initApplicationContext(); //获取service实例 - HomeWorkService homeWorkService=IOC.getBean(HomeWorkServiceImpl.class); - WrongQuestionService wrongQuestionService=IOC.getBean(WrongQuestionServiceImpl.class); - TroubleshootingService troubleshootingService=IOC.getBean(TroubleshootingServiceImpl.class); - QuestionService questionService=IOC.getBean(QuestionServiceImpl.class); - NoticeService noticeService=IOC.getBean(NoticeServiceImpl.class); - SubmitService submitService=IOC.getBean(SubmitServiceImpl.class); + HomeWorkService homeWorkService = IOC.getBean(HomeWorkServiceImpl.class); + WrongQuestionService wrongQuestionService = IOC.getBean(WrongQuestionServiceImpl.class); + TroubleshootingService troubleshootingService = IOC.getBean(TroubleshootingServiceImpl.class); + QuestionService questionService = IOC.getBean(QuestionServiceImpl.class); + NoticeService noticeService = IOC.getBean(NoticeServiceImpl.class); + SubmitService submitService = IOC.getBean(SubmitServiceImpl.class); WordService wordService = IOC.getBean(WordServiceImpl.class); @Action - public R get(HttpServletRequest request ) throws Exception { + public R get(HttpServletRequest request) throws Exception { return R.ok().put("msg", "Hello World").message("GET请求成功"); } @@ -44,78 +44,81 @@ import java.util.*; public R getHomeWorkByCourse(HttpServletRequest request) throws Exception { String course_name = String.valueOf(request.getParameter("course_name")); Integer id = Integer.parseInt(request.getParameter("id")); - List homeWork = homeWorkService.getHomeWorkByCourse(course_name,id); - return R.ok().put("data",homeWork); + List homeWork = homeWorkService.getHomeWorkByCourse(course_name, id); + return R.ok().put("data", homeWork); } @Action public R getHomeWorkByTeacherName(HttpServletRequest request) throws Exception { String name = String.valueOf(request.getParameter("name")); Integer id = Integer.parseInt(request.getParameter("id")); - List homeWork = homeWorkService.getHomeWorkByTeacherName(name,id); - return R.ok().put("data",homeWork); + List homeWork = homeWorkService.getHomeWorkByTeacherName(name, id); + return R.ok().put("data", homeWork); } @Action public R getHomeWorkByHomeworkName(HttpServletRequest request) throws Exception { String homework_name = String.valueOf(request.getParameter("homework_name")); Integer id = Integer.parseInt(request.getParameter("id")); - List homeWork = homeWorkService.getHomeWorkByHomeworkName(homework_name,id); - return R.ok().put("data",homeWork); + List homeWork = homeWorkService.getHomeWorkByHomeworkName(homework_name, id); + return R.ok().put("data", homeWork); } //获取个人所有作业 @Action public R getHomeWork(HttpServletRequest request) throws Exception { - Integer id =Integer.parseInt(request.getParameter("id")); + Integer id = Integer.parseInt(request.getParameter("id")); int currentPage = Integer.parseInt(request.getParameter("currentPage")); int pageSize = Integer.parseInt(request.getParameter("pageSize")); - int offset = (currentPage-1)*pageSize; - List homeWork = homeWorkService.getHomeWork(id,offset,pageSize); - return R.ok().put("data",homeWork); + int offset = (currentPage - 1) * pageSize; + List homeWork = homeWorkService.getHomeWork(id, offset, pageSize); + return R.ok().put("data", homeWork); } @Action public R getHomeWorkCount(HttpServletRequest request) throws Exception { - Integer student_id =Integer.parseInt(request.getParameter("id")); + Integer student_id = Integer.parseInt(request.getParameter("id")); int count = homeWorkService.getCount(student_id); - return R.ok().put("data",count); + return R.ok().put("data", count); } + @Action public R getWrongHomeworkCount(HttpServletRequest request) throws Exception { - int student_id =Integer.parseInt(request.getParameter("student_id")); + int student_id = Integer.parseInt(request.getParameter("student_id")); int count = wrongQuestionService.getWrongHomeworkCount(student_id); - return R.ok().put("data",count); + return R.ok().put("data", count); } + @Action public R getWrongHomework(HttpServletRequest request) throws Exception { - Integer student_id =Integer.parseInt(request.getParameter("student_id")); + Integer student_id = Integer.parseInt(request.getParameter("student_id")); int currentPage = Integer.parseInt(request.getParameter("currentPage")); int pageSize = Integer.parseInt(request.getParameter("pageSize")); - int offset = (currentPage-1)*pageSize; - List wrongQuestion = wrongQuestionService.getWrongHomework(student_id,offset,pageSize); - return R.ok().put("data",wrongQuestion); + int offset = (currentPage - 1) * pageSize; + List wrongQuestion = wrongQuestionService.getWrongHomework(student_id, offset, pageSize); + return R.ok().put("data", wrongQuestion); } @Action public R gerWrongQuestion(HttpServletRequest request) throws Exception { - Integer homework_id =Integer.parseInt(request.getParameter("homework_id")); - Integer student_id =Integer.parseInt(request.getParameter("student_id")); - List question = wrongQuestionService.getWrongQuestion(homework_id,student_id); + Integer homework_id = Integer.parseInt(request.getParameter("homework_id")); + Integer student_id = Integer.parseInt(request.getParameter("student_id")); + List question = wrongQuestionService.getWrongQuestion(homework_id, student_id); System.out.println(question); - return R.ok().put("data",question); + return R.ok().put("data", question); } + //提交作业（简答题） @Action public R submitHomework(HttpServletRequest request) throws Exception { String userAnswersJson = request.getParameter("userAnswersJson"); - Integer studentId =Integer.parseInt(request.getParameter("student_id")); - Integer homeworkId =Integer.parseInt(request.getParameter("homework_id")); + Integer studentId = Integer.parseInt(request.getParameter("student_id")); + Integer homeworkId = Integer.parseInt(request.getParameter("homework_id")); //获取提交时间设置为年月日格式 String submitTimeStr = request.getParameter("submitTime"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date submitTimeDate = sdf.parse(submitTimeStr); - homeWorkService.submitHomework(studentId,homeworkId,submitTimeDate,userAnswersJson); + homeWorkService.submitHomework(studentId, homeworkId, submitTimeDate, userAnswersJson); return R.ok().message("请求成功"); } @@ -123,14 +126,14 @@ import java.util.*; @Action public R submitWrongQuestion(HttpServletRequest request) throws Exception { String userAnswersJson = request.getParameter("userAnswersJson"); - Integer studentId =Integer.parseInt(request.getParameter("student_id")); - Integer homeworkId =Integer.parseInt(request.getParameter("homework_id")); + Integer studentId = Integer.parseInt(request.getParameter("student_id")); + Integer homeworkId = Integer.parseInt(request.getParameter("homework_id")); //获取提交时间设置为年月日格式 String submitTimeStr = request.getParameter("submitTime"); System.out.println(submitTimeStr); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date submitTimeDate = sdf.parse(submitTimeStr); - wrongQuestionService.submitWrongQuestion(studentId,homeworkId,submitTimeDate,userAnswersJson); + wrongQuestionService.submitWrongQuestion(studentId, homeworkId, submitTimeDate, userAnswersJson); return R.ok().message("请求成功"); } @@ -153,17 +156,17 @@ import java.util.*; //获取题目 @Action public R getQuestion(HttpServletRequest request) throws Exception { - Integer homework_id =Integer.parseInt(request.getParameter("homework_id")); + Integer homework_id = Integer.parseInt(request.getParameter("homework_id")); List question = questionService.getQuestion(homework_id); - return R.ok().put("data",question); + return R.ok().put("data", question); } //根据word文档发布作业 @Action - public R assignHomeworkByWord(HttpServletRequest request){ + public R assignHomeworkByWord(HttpServletRequest request) { String homework = wordService.assHomeworkByWord(request); - return R.ok().put("data",homework); + return R.ok().put("data", homework); } @@ -214,21 +217,33 @@ import java.util.*; //教师端获取作业 @Action public R getTHomeWork(HttpServletRequest request) throws Exception { - Integer id =Integer.parseInt(request.getParameter("id")); + Integer id = Integer.parseInt(request.getParameter("id")); List homeWork = homeWorkService.getTHomeWork(id); - return R.ok().put("data",homeWork); + return R.ok().put("data", homeWork); + } + + //教师端查找未批，已批和未提交的学生 + @Action + public R getGradeHomeWork(HttpServletRequest request) throws Exception { + Integer id = Integer.parseInt(request.getParameter("id")); + Integer submitStatus = Integer.parseInt(request.getParameter("submitStatus")); + List GradeHomeWork = submitService.getGradeHomeWork(submitStatus, id); + return R.ok().put("data", GradeHomeWork); } - //教师端根据作业id查找作业 + //教师端作业关键字查询 @Action - public R getSubmitHomeWorkByid(HttpServletRequest request) throws Exception { - Integer id =Integer.parseInt(request.getParameter("id")); - List submitHomeWork = submitService.getSubmitHomeWorkByid(id); - return R.ok().put("data",submitHomeWork); + public R getHomeWorkByKeyword(HttpServletRequest request) throws Exception { + Integer id = Integer.parseInt(request.getParameter("id")); + String keyword = request.getParameter("keyword"); + List homeWork = homeWorkService.getHomeWorkByKeyword(id,keyword); + return R.ok().put("data", homeWork); } - //教师端查找所有提交的作业 - public R getSubmitHomeWork(HttpServletRequest request) throws Exception { - Integer id=Integer.parseInt(request.getParameter("id")); - List submitHomeWork = homeWorkService.getSubmitHomeWork(id); - return R.ok().put("data",submitHomeWork); + //教师端作业筛选 + @Action + public R getHomeWorkByStatus(HttpServletRequest request) throws Exception { + Integer id = Integer.parseInt(request.getParameter("id")); + String submitStatus = request.getParameter("submitStatus"); + List homeWork = homeWorkService.getHomeWorkByStatus(id,submitStatus); + return R.ok().put("data", homeWork); } -} +} \ No newline at end of file diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java index d8202c3..d3543e2 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java @@ -17,7 +17,8 @@ public interface HomeWorkDao extends IBaseDao { List getTHomeWork(Connection connection, int id); - List getSubmitHomeWork(Connection connection, int id); + List getHomeWorkByKeyword(Connection connection, int id,String keyword); + List getHomeWorkByStatus(Connection connection, int id,String status); //提交作业 void submitHomework(Connection connection, Submit submitHomework); diff --git a/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java b/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java index 6d0692d..294ee73 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java @@ -1,10 +1,11 @@ package com.wetoband.template.dao; +import com.wetoband.template.entity.Student; + import java.sql.Connection; +import java.util.List; public interface SubmitDao { - public void getSubmitHomeWork(Connection connection, int id); - - public void getSubmitHomeWorkByid(Connection connection, int id); + public List getGradeHomeWork(Connection connection, int submitStatus,int id); } diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java index c787979..f8ae0b6 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -171,7 +171,7 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa @Override public List getTHomeWork(Connection connection, int id) { - String sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, " + + String sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, homework.homework_id, " + "SUM(CASE WHEN submit.submitStatus = 0 THEN 1 ELSE 0 END) AS unsubmitted_count, " + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS submitted_count, " + "SUM(CASE WHEN submit.submitStatus = 2 THEN 1 ELSE 0 END) AS graded_count, " + @@ -186,6 +186,7 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa try (ResultSet rs = pstm.executeQuery()) { while (rs.next()) { HomeWork homework = new HomeWork(); + homework.setHomework_id(rs.getInt("homework_id")); homework.setHomework_name(rs.getString("homework_name")); homework.setStart_time(rs.getString("startTime")); homework.setFinish_time(rs.getString("finishTime")); @@ -204,14 +205,93 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa @Override - public List getSubmitHomeWork(Connection connection, int id) { - String sql = "SELECT submit.* FROM submit " + - "JOIN teacher ON submit.teacher_id = teacher.id " + - "WHERE teacher.id = ? "; + public List getHomeWorkByKeyword(Connection connection, int id,String keyword) { + String sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, homework.homework_id, " + + "SUM(CASE WHEN submit.submitStatus = 0 THEN 1 ELSE 0 END) AS unsubmitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS submitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 2 THEN 1 ELSE 0 END) AS graded_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS ungraded_count " + + "FROM homework " + + "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " + + "WHERE submit.teacher_id = ? " +"AND homework.homework_name LIKE ?"+ + "GROUP BY homework.homework_id"; + List homeworkList = new ArrayList<>(); + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + pstm.setInt(1,id); + pstm.setString(2,"%"+keyword+"%");//模糊查询 + try (ResultSet rs = pstm.executeQuery()) { + while (rs.next()) { + HomeWork homework = new HomeWork(); + homework.setHomework_id(rs.getInt("homework_id")); + homework.setHomework_name(rs.getString("homework_name")); + homework.setStart_time(rs.getString("startTime")); + homework.setFinish_time(rs.getString("finishTime")); + homework.setGraded(rs.getInt("graded_count")); + homework.setUngraded(rs.getInt("ungraded_count")); + homework.setSubmit(rs.getInt("submitted_count")); + homework.setUnsubmitted(rs.getInt("unsubmitted_count")); + homeworkList.add(homework); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + return homeworkList; + } - List submitList = new ArrayList<>(); -return null; + @Override + public List getHomeWorkByStatus(Connection connection, int id, String status) { + // 通过状态参数来判断查询进行中的作业或者已结束的作业 + String sql = ""; + if ("qualified".equals(status)) { + // 进行中的作业：当前时间在 startTime 和 finishTime 之间 + sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, homework.homework_id, " + + "SUM(CASE WHEN submit.submitStatus = 0 THEN 1 ELSE 0 END) AS unsubmitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS submitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 2 THEN 1 ELSE 0 END) AS graded_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS ungraded_count " + + "FROM homework " + + "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " + + "WHERE submit.teacher_id = ? " + + "AND homework.startTime <= CURRENT_TIMESTAMP AND homework.finishTime >= CURRENT_TIMESTAMP " + // 进行中作业 + "GROUP BY homework.homework_id"; + } else if ("unqualified".equals(status)) { + // 已结束的作业：当前时间超过 finishTime + sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, homework.homework_id, " + + "SUM(CASE WHEN submit.submitStatus = 0 THEN 1 ELSE 0 END) AS unsubmitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS submitted_count, " + + "SUM(CASE WHEN submit.submitStatus = 2 THEN 1 ELSE 0 END) AS graded_count, " + + "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS ungraded_count " + + "FROM homework " + + "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " + + "WHERE submit.teacher_id = ? " + + "AND homework.finishTime < CURRENT_TIMESTAMP " + // 已结束作业 + "GROUP BY homework.homework_id"; + } + + List homeworkList = new ArrayList<>(); + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + pstm.setInt(1, id); + try (ResultSet rs = pstm.executeQuery()) { + while (rs.next()) { + HomeWork homework = new HomeWork(); + homework.setHomework_id(rs.getInt("homework_id")); + homework.setHomework_name(rs.getString("homework_name")); + homework.setStart_time(rs.getString("startTime")); + homework.setFinish_time(rs.getString("finishTime")); + homework.setGraded(rs.getInt("graded_count")); + homework.setUngraded(rs.getInt("ungraded_count")); + homework.setSubmit(rs.getInt("submitted_count")); + homework.setUnsubmitted(rs.getInt("unsubmitted_count")); + homeworkList.add(homework); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + return homeworkList; } + @Override public void submitHomework(Connection connection, Submit submitHomework) { int submitId = submitHomework.getSubmitId(); diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java index 9c69c1c..6eb49f4 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java @@ -1,18 +1,51 @@ package com.wetoband.template.dao.impl; import com.wetoband.template.dao.SubmitDao; +import com.wetoband.template.entity.HomeWork; +import com.wetoband.template.entity.Student; +import com.wetoband.template.entity.Submit; +import org.springframework.stereotype.Repository; import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +@Repository public class SubmitDaoImpl implements SubmitDao { @Override - public void getSubmitHomeWork(Connection connection, int id) { + public List getGradeHomeWork(Connection connection, int submitStatus, int id) { + String sql = "SELECT " + + " student.name, student.sno " + + "FROM " + + " student " + + "JOIN " + + " submit ON student.id = submit.student_id " + + "WHERE " + + " submit.teacher_id=1 AND submit.submitStatus = ? AND submit.homework_id = ? " + + "GROUP BY " + + " submit.student_id"; - } - - @Override - public void getSubmitHomeWorkByid(Connection connection, int id) { + List submitList = new ArrayList<>(); + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + pstm.setInt(1,submitStatus); + pstm.setInt(2,id); + try (ResultSet rs = pstm.executeQuery()) { + while (rs.next()) { + Student student = new Student(); + student.setStudentName(rs.getString("name")); + student.setStudentSno(rs.getString("sno")); + submitList.add(student); + } + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + return submitList; } + } diff --git a/HomeWork-java/src/com/wetoband/template/entity/Student.java b/HomeWork-java/src/com/wetoband/template/entity/Student.java new file mode 100644 index 0000000..4794bd1 --- /dev/null +++ b/HomeWork-java/src/com/wetoband/template/entity/Student.java @@ -0,0 +1,17 @@ +package com.wetoband.template.entity; + +import lombok.Data; + +import javax.persistence.Column; + +@Data +public class Student { + @Column(name = "id") + private Integer studentId; + + @Column(name = "name") + private String studentName; + + @Column(name = "sno") + private String studentSno; +} diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java index 7942dd9..b55e8b2 100644 --- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java +++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java @@ -15,7 +15,9 @@ public interface HomeWorkService { public List getHomeWorkByTeacherName(String name,int id) throws Exception; public List getHomeWorkByHomeworkName(String homework_name,int id) throws Exception; public List getTHomeWork(int id) throws Exception; - public List getSubmitHomeWork(int id) throws Exception; + public List getHomeWorkByKeyword(int id,String keyword) throws Exception; + List getHomeWorkByStatus(Integer id, String submitStatus) throws Exception; void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, String userAnswersJson) throws Exception; public int getCount(int id) throws Exception; + } diff --git a/HomeWork-java/src/com/wetoband/template/service/SubmitService.java b/HomeWork-java/src/com/wetoband/template/service/SubmitService.java index 2b72a2b..9ba789f 100644 --- a/HomeWork-java/src/com/wetoband/template/service/SubmitService.java +++ b/HomeWork-java/src/com/wetoband/template/service/SubmitService.java @@ -1,5 +1,6 @@ package com.wetoband.template.service; +import com.wetoband.template.entity.Student; import com.wetoband.template.entity.Submit; import org.springframework.stereotype.Service; @@ -7,6 +8,5 @@ import java.util.List; public interface SubmitService { - public List getSubmitHomeWork(int id) throws Exception; - public List getSubmitHomeWorkByid(int id) throws Exception; + public List getGradeHomeWork(int submitStatus,int id) throws Exception; } diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java index 022b567..e993811 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java @@ -54,9 +54,15 @@ public class HomeWorkServiceImpl implements HomeWorkService { } @Override - public List getSubmitHomeWork(int id) throws Exception { + public List getHomeWorkByKeyword(int id,String keyword) throws Exception { final Connection conntion =ActionToolBase.getDBConnection(); - return homeWorkDao.getSubmitHomeWork(conntion,id); + return homeWorkDao.getHomeWorkByKeyword(conntion,id,keyword); + } + + @Override + public List getHomeWorkByStatus(Integer id, String submitStatus) throws Exception { + final Connection connection = ActionToolBase.getDBConnection(); + return homeWorkDao.getHomeWorkByStatus(connection,id,submitStatus); } // @Transactional() diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java index dc39554..ba2ab7a 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java @@ -1,19 +1,24 @@ package com.wetoband.template.service.impl; +import com.fy.basejar.tool.ActionToolBase; +import com.wetoband.template.dao.SubmitDao; +import com.wetoband.template.entity.Student; import com.wetoband.template.entity.Submit; import com.wetoband.template.service.SubmitService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Connection; import java.util.List; @Service public class SubmitServiceImpl implements SubmitService { + @Autowired + private SubmitDao submitDao; @Override - public List getSubmitHomeWork(int id) throws Exception { - return null; - } - @Override - public List getSubmitHomeWorkByid(int id) throws Exception { - return null; + public List getGradeHomeWork(int submitStatus,int id) throws Exception { + final Connection conntion = ActionToolBase.getDBConnection(); + return submitDao.getGradeHomeWork(conntion,submitStatus,id); } + } diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties index 49cc81a..b061f9a 100644 --- a/HomeWork-java/target/classes/config.properties +++ b/HomeWork-java/target/classes/config.properties @@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60 JDBC_DRIVER=com.mysql.jdbc.Driver -JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8 +JDBC_URL=jdbc:mysql://8.138.41.70:3306/homework?useUnicode=true&characterEncoding=utf8 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8 JDBC_USERNAME=root diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties index 49cc81a..b061f9a 100644 --- a/HomeWork-java/tempResources/config.properties +++ b/HomeWork-java/tempResources/config.properties @@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60 JDBC_DRIVER=com.mysql.jdbc.Driver -JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8 +JDBC_URL=jdbc:mysql://8.138.41.70:3306/homework?useUnicode=true&characterEncoding=utf8 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8 JDBC_USERNAME=root diff --git a/TeacherHomeWork-vite/src/router/index.js b/TeacherHomeWork-vite/src/router/index.js index d33a43e..c236301 100644 --- a/TeacherHomeWork-vite/src/router/index.js +++ b/TeacherHomeWork-vite/src/router/index.js @@ -20,7 +20,7 @@ const routes = [ component: HomeworkManager, }, { - path: '/GradeManger', + path: '/GradeManger/', name: 'GradeManger', component: GradeManger, }, @@ -30,9 +30,10 @@ const routes = [ component: LearningProgress, }, { - path: '/GradeHomework', + path: '/GradeHomework/:homeworkId', name: 'GradeHomework', component: GradeHomework, + props: true, }, { path: '/HomeworkQuestion', diff --git a/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue b/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue index a839378..539e4f5 100644 --- a/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue +++ b/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue @@ -1,14 +1,22 @@ - \ No newline at end of file diff --git a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue index 0e28c13..0fcd670 100644 --- a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue +++ b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue @@ -1,7 +1,7 @@