diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index d1fb7e242833f9aedf36897d53b5dd35f59438b2..a06608f23887695c5bba024810cab79ccb07964d 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -41,27 +41,11 @@ import java.util.*; } @Action - public R getHomeWorkByCourse(HttpServletRequest request) throws Exception { - String course_name = String.valueOf(request.getParameter("course_name")); + public R findHomeWork(HttpServletRequest request) throws Exception { Integer id = Integer.parseInt(request.getParameter("id")); - 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); - } - - @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); + String input = String.valueOf(request.getParameter("input")); + List homeWork = homeWorkService.findHomeWork(id,input); + return R.ok().put("data",homeWork); } //获取个人所有作业 diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java index d72e1b1b7333fafa39f31bbbf7e5a0eece521485..0dc67cb9e777e3d158dc1e862167c6a7a74ef3f0 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java @@ -11,10 +11,8 @@ import java.util.List; public interface HomeWorkDao extends IBaseDao { //HomeWork getHomeWorkById(Connection connection, int id) throws SQLException; List getHomeWork(Connection connection, int id, int offset,int pageSize) throws SQLException; - List getHomeWorkByCourse(Connection connection, String course_name,int id) throws SQLException; - List getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException; - List getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException; + List findHomeWork(Connection connection, int id, String input) throws SQLException; List getTHomeWork(Connection connection, int id, int offset, int pageSize); List getHomeWorkByKeyword(Connection connection, int id,String keyword); 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 a00351e462fff00439de00e0dcd205940cf09c53..a2bc3b45312fde3aa01d69595deee39c9cc878de 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -101,90 +101,41 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa return homeworkList; } + //作业模糊查询 @Override - public List getHomeWorkByCourse(Connection connection, String course_name,int id) throws SQLException { - String sql = "SELECT homework.*,teacher.name , submit.submitStatus FROM homework " + - "JOIN teacher ON homework.teacher_id = teacher.id " + - "LEFT JOIN submit ON submit.student_id = ? AND homework.homework_id = submit.homework_id "; - List homeworkList = new ArrayList<>(); - try (PreparedStatement pstm = connection.prepareStatement(sql)) { - pstm.setString(1, course_name); - pstm.setInt(2,id); - try (ResultSet rs = pstm.executeQuery()) { - while (rs.next()) { - HomeWork homework = new HomeWork(); - homework.setHomework_id(rs.getInt("homework_id")); - homework.setTeacher_id(rs.getInt("teacher_id")); - homework.setType(rs.getInt("type")); - homework.setHomework_describe(rs.getString("homeworkDescribe")); - homework.setStart_time(rs.getString("startTime")); - homework.setFinish_time(rs.getString("finishTime")); - homework.setHomework_name(rs.getString("homework_name")); - homework.setCourse_name(rs.getString("course_name")); - homeworkList.add(homework); - } - } - } catch (SQLException e) { - throw e; - } - return homeworkList; - } - - @Override - public List getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException { - String sql = "SELECT homework.* FROM homework " + - "JOIN teacher ON homework.teacher_id = teacher.id " + - "JOIN homework_student ON homework.homework_id = homework_student.homework_id " + - "WHERE teacher.name = ? AND homework_student.student_id = ?;"; - List homeworkList = new ArrayList<>(); - try (PreparedStatement pstm = connection.prepareStatement(sql)) { - pstm.setString(1, name); - pstm.setInt(2,id); - try (ResultSet rs = pstm.executeQuery()) { - while (rs.next()) { - HomeWork homework = new HomeWork(); - homework.setHomework_id(rs.getInt("homework_id")); - homework.setTeacher_id(rs.getInt("teacher_id")); - homework.setType(rs.getInt("type")); - homework.setHomework_describe(rs.getString("homeworkDescribe")); - homework.setStart_time(rs.getString("startTime")); - homework.setFinish_time(rs.getString("finishTime")); - homework.setHomework_name(rs.getString("homework_name")); - homework.setCourse_name(rs.getString("course_name")); - homeworkList.add(homework); - } - } - } catch (SQLException e) { - throw e; - } - return homeworkList; - } - - @Override - public List getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException { - String sql = "SELECT homework.* FROM homework " + - "JOIN homework_student ON homework_student.homework_id = homework.homework_id " + - "JOIN student ON homework_student.student_id = student.id " + - "WHERE homework.homework_name = ? AND student.id = ? "; + public List findHomeWork(Connection connection, int id, String input) throws SQLException{ + // SQL语句 + String sql = "SELECT " + + " homework.*, " + + " teacher.NAME, " + + " submit.submitStatus, " + + " submit.score " + + "FROM " + + " homework " + + " RIGHT JOIN submit ON submit.student_id = ? " + + " INNER JOIN teacher ON teacher.id = submit.teacher_id " + + " AND homework.homework_id = submit.homework_id " + + " WHERE CONCAT(homework.course_name,homework.homework_name,teacher.name) LIKE ?"; List homeworkList = new ArrayList<>(); - try (PreparedStatement pstm = connection.prepareStatement(sql)) { - pstm.setString(1, homework_name); - pstm.setInt(2,id); - try (ResultSet rs = pstm.executeQuery()) { - while (rs.next()) { + try(PreparedStatement ptsm = connection.prepareStatement(sql)){ + ptsm.setInt(1,id); + ptsm.setString(2,"%"+input+"%"); + try(ResultSet rs = ptsm.executeQuery()){ + while (rs.next()){ HomeWork homework = new HomeWork(); homework.setHomework_id(rs.getInt("homework_id")); - homework.setTeacher_id(rs.getInt("teacher_id")); homework.setType(rs.getInt("type")); homework.setHomework_describe(rs.getString("homeworkDescribe")); homework.setStart_time(rs.getString("startTime")); homework.setFinish_time(rs.getString("finishTime")); homework.setHomework_name(rs.getString("homework_name")); homework.setCourse_name(rs.getString("course_name")); + homework.setTeacher_name(rs.getString("name")); + homework.setScore(rs.getDouble("score")); homeworkList.add(homework); } } - } catch (SQLException e) { + }catch (SQLException e){ throw e; } return homeworkList; diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java index e34791346fe7ea5a1f94c0037a9607356bd87a95..828e602329b0f4c497ffced6b9f18a6501d17390 100644 --- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java +++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java @@ -11,10 +11,8 @@ import java.util.List; public interface HomeWorkService { //public HomeWork getHomeWorkById(int id) throws Exception; public List getHomeWork( int id,int offset,int pageSize) throws Exception; - public List getHomeWorkByCourse(String course_name,int id) throws Exception; - public List getHomeWorkByTeacherName(String name,int id) throws Exception; - public List getHomeWorkByHomeworkName(String homework_name,int id) throws Exception; - public List getTHomeWork(int id,int offset,int pageSize) throws Exception; + public List findHomeWork( int id, String input ) throws Exception; + public List getTHomeWork(int id) throws Exception; public List getHomeWorkByKeyword(int id,String keyword) throws Exception; List getHomeWorkByStatus(Integer id, String submitStatus) throws Exception; public int getTHomeWorkCount(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 b94821bbeec439d38b2a9e6848291d2d2bc58bc8..af96a15dd39c50a4624c374a2483fe49ad408be2 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java @@ -33,20 +33,12 @@ public class HomeWorkServiceImpl implements HomeWorkService { return homeWorkDao.getHomeWork(connection,id,offset,pageSize); } - public List getHomeWorkByCourse(String course_name,int id) throws Exception { + //查询作业 + public List findHomeWork(int id, String input) throws Exception { final Connection connection = ActionToolBase.getDBConnection(); - return homeWorkDao.getHomeWorkByCourse(connection,course_name,id); + return homeWorkDao.findHomeWork(connection,id,input); } - public List getHomeWorkByTeacherName(String name,int id) throws Exception { - final Connection connection = ActionToolBase.getDBConnection(); - return homeWorkDao.getHomeWorkByTeacherName(connection,name,id); - } - - public List getHomeWorkByHomeworkName(String homework_name,int id) throws Exception { - final Connection connection = ActionToolBase.getDBConnection(); - return homeWorkDao.getHomeWorkByHomeworkName(connection,homework_name,id); - } public List getTHomeWork(int id,int offset,int pageSize) throws Exception { final Connection connection = ActionToolBase.getDBConnection(); diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties index b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf..77d8be97067836e271cf7fbdc9a13378376ae69e 100644 --- a/HomeWork-java/target/classes/config.properties +++ b/HomeWork-java/target/classes/config.properties @@ -32,7 +32,7 @@ SWAP_VALUE_SERVER_PORT=6666 GET_SWAP_VALUE_IP=192.168.10.254 GET_SWAP_VALUE_PORT=6666 -REDIS_HOST=8.138.182.34 +REDIS_HOST=8.138.41.70 REDIS_PORT=6379 REDIS_PASSWORD=123456 diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties index b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf..77d8be97067836e271cf7fbdc9a13378376ae69e 100644 --- a/HomeWork-java/tempResources/config.properties +++ b/HomeWork-java/tempResources/config.properties @@ -32,7 +32,7 @@ SWAP_VALUE_SERVER_PORT=6666 GET_SWAP_VALUE_IP=192.168.10.254 GET_SWAP_VALUE_PORT=6666 -REDIS_HOST=8.138.182.34 +REDIS_HOST=8.138.41.70 REDIS_PORT=6379 REDIS_PASSWORD=123456 diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue index d19fe8571404b0393f940db24b5a0d9e59908deb..34ea85c903bd693b50653dc702e576d65602d31c 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue @@ -10,15 +10,18 @@
+ - + - + + + 查看错题
@@ -75,10 +78,11 @@ import { ref, computed, onMounted } from 'vue' import { Search } from '@element-plus/icons-vue' import { useRouter } from 'vue-router'; import { HttpClient } from '../../network/HttpClient' +import axios from 'axios'; -const input1 = ref('') -const selectedFilter = ref('') +const searchInput = ref('') //模糊搜索 +const selectedFilter = ref('') //标签选择（其实留着也没什么用） const router = useRouter() const currentPage = ref(1) const pageSize = ref(2) @@ -124,7 +128,7 @@ const worng = () => { // } // } -const options = [ +const options = ref([ { value: '课程', label: '课程', @@ -133,26 +137,20 @@ const options = [ value: '发布教师', label: '发布教师', }, - { - value: '截止时间', - label: '截止时间', - }, { value: '作业名称', label: '作业名称', }, - { - value: '成绩', - label: '成绩', - }, - { - value: '完成状态', - label: '完成状态', - }, -] +]) + onMounted(() => { getHomeWorkCount() getHomeWork() + + //让选项默认为第一项 + if (options.value.length > 0) { + selectedFilter.value = options.value[0].value; + } }) @@ -168,6 +166,20 @@ const getHomeWorkCount = async () => { }) } +//模糊搜索作业 +const FindHomework = async (searchInput) => { + await HttpClient.get('findHomeWork', { + id: 1, + input: searchInput + }).then(res => { + tableData.value = res.data.data + console.log("返回的数据:"+res) + }).catch(err => { + console.log("报错:"+err) + }) +} + + // // 计算属性：根据筛选条件和搜索内容过滤数据 // const filteredData = computed(() => { // let filtered = tableData.value @@ -181,6 +193,7 @@ const getHomeWorkCount = async () => { // ) // } // }) + //获取所有作业 const getHomeWork = async () => { await HttpClient.get('getHomeWork', { diff --git a/HomeWork-vite/src/views/WrongManager/WrongManager.vue b/HomeWork-vite/src/views/WrongManager/WrongManager.vue index e252c7e882b549564b62e520c7ec101986e2099f..3ae40769ed3f5df2d83d68900926225f667d75e8 100644 --- a/HomeWork-vite/src/views/WrongManager/WrongManager.vue +++ b/HomeWork-vite/src/views/WrongManager/WrongManager.vue @@ -11,15 +11,12 @@
- - - - - + - + + +
- + - - + + - - + +