diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index d82a00fee5a78189c394bbff3c3661f098b46c13..f88a00f6139feb89fb5249f666be35b937470061 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -89,6 +89,7 @@ import java.util.*; 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); } //提交作业(简答题) diff --git a/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java b/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java index 8b0701594f66f4f7031fd84fab8c04069c7635dc..c837150c7811d9fba42d51c75cbba92e9587c2c9 100644 --- a/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java +++ b/HomeWork-java/src/com/wetoband/template/constant/ResultCode.java @@ -5,6 +5,7 @@ public enum ResultCode { SUCCESS(200, "请求成功"), ERROR(400, "请求出错"); + private int code; private String msg; ResultCode(int code, String msg){ diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java index 7bb03bf0499bb3efd4740432d8996f3255e085c5..d8baf284a6bb067ba358853ae2c0714c6943a3fc 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java @@ -13,18 +13,18 @@ public class QuestionDaoImpl implements QuestionDao { @Override public ArrayList getQuestion(Connection connection, int homework_id) throws Exception { ArrayList questions = new ArrayList<>(); - String sql ="SELECT\n" + - "\tq.title,\n" + - "\tq.question_id,\n" + - "\tq.type,\n" + - "\tJSON_ARRAYAGG( qo.option_value ) AS optionStr \n" + - "FROM\n" + - "\tquestion q\n" + - "\tINNER JOIN question_option qo ON q.question_id = qo.question_id \n" + - "WHERE\n" + - "\tq.question_id IN ( SELECT hq.question_id FROM homework_question hq WHERE hq.homework_id = ? ) \n" + - "GROUP BY\n" + - "\tq.question_id;"; + String sql = "SELECT q.title, " + + "q.question_id, " + + "q.type, " + + "JSON_ARRAYAGG(qo.option_value) AS optionStr " + + "FROM question q " + + "LEFT JOIN question_option qo " + + "ON q.question_id = qo.question_id " + + "WHERE q.question_id IN ( " + + "SELECT hq.question_id " + + "FROM homework_question hq " + + "WHERE hq.homework_id = ? ) " + + "GROUP BY q.question_id;"; try (PreparedStatement pstm = connection.prepareStatement(sql)) { pstm.setInt(1, homework_id); try (ResultSet rs = pstm.executeQuery()) { diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java index b4b37f6c5b24bcc3c906a396b0f89bc5fc96be77..fa639916520e944f4c795fe1669b6235332b868f 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java @@ -50,26 +50,27 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao { @Override public List getWrongQuestion(Connection connection, int homework_id , int student_id) throws Exception { ArrayList questions = new ArrayList<>(); - String sql = "SELECT\n" + - "\tq.title,\n" + - "\tq.question_id,\n" + - "\tq.type,\n" + - "\tJSON_ARRAYAGG(qo.option_value) AS optionStr\n" + - "FROM\n" + - "\tquestion q\n" + - "\tINNER JOIN question_option qo ON q.question_id = qo.question_id \n" + - "WHERE\n" + - "\tq.question_id IN (\n" + - "\tSELECT\n" + - "\t\thwq.question_id \n" + - "\tFROM\n" + - "\t\thomework_wrongquestion hwq \n" + - "\tWHERE\n" + - "\t\thomework_id = ? AND\n" + - "\t\tstudent_id = ? \n" + - "\t)\n" + - "GROUP BY\n" + - " q.question_id;"; + + String sql = "SELECT " + + "q.title, " + + "q.question_id, " + + "q.type, " + + "JSON_ARRAYAGG(CAST(qo.option_value AS CHAR CHARACTER SET utf8mb4)) AS optionStr " + + "FROM " + + "question q " + + "LEFT JOIN question_option qo ON q.question_id = qo.question_id " + + "WHERE " + + "q.question_id IN ( " + + "SELECT " + + "hwq.question_id " + + "FROM " + + "homework_wrongquestion hwq " + + "WHERE " + + "homework_id = ? AND " + + "student_id = ? " + + ") " + + "GROUP BY " + + "q.question_id;"; try (PreparedStatement pstm = connection.prepareStatement(sql)) { pstm.setInt(1, homework_id); pstm.setInt(2, student_id); @@ -79,6 +80,7 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao { question.setQuestion_id(rs.getInt("question_id")); question.setTitle(rs.getString("title")); question.setType(rs.getInt("type")); + System.out.println("123"+rs.getString("optionStr")); question.setOptionArr(rs.getString("optionStr")); questions.add(question); } diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties index 1b067acb35011027ebec832bea924a16fdedbe42..49cc81a4ae0e5f90dbcc2869ba3283037f11966f 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 +JDBC_URL=jdbc:mysql://8.138.182.34: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 1b067acb35011027ebec832bea924a16fdedbe42..49cc81a4ae0e5f90dbcc2869ba3283037f11966f 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 +JDBC_URL=jdbc:mysql://8.138.182.34: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-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue index 640d3cc0f10656cde4a401131e09d03e1f2f1336..926e38c02b907615cdc77f949d84c386e263cc19 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue @@ -12,13 +12,22 @@
{{ index + 1 }}. {{ question.title }} - + + (判断题) + + + (单选题) + + (多选题) + + (简答题) +
- + {{ String.fromCharCode(65 + index) }}. @@ -28,7 +37,7 @@ - + {{ String.fromCharCode(65 + index) }}. @@ -37,6 +46,21 @@ + + + + + {{ String.fromCharCode(65 + index) }}. + + {{ option }} + + + +
+ +
@@ -47,7 +71,7 @@