diff --git a/HomeWork-java/pom.xml b/HomeWork-java/pom.xml index b577699a7ec39912971b4939b6138ad230286864..100737b8f00d8a3dbd632ef1659f1e3a1326717a 100644 --- a/HomeWork-java/pom.xml +++ b/HomeWork-java/pom.xml @@ -271,6 +271,11 @@ + + org.springframework.data + spring-data-redis + 3.4.0 + src diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index 33fd114105a444bf3209b7ab6c7d3d97ef4253b7..b53ee1a0c2433d20481b7c9f78641d697d7c2fe8 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -4,7 +4,6 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.TypeReference; import com.fy.basejar.tool.ActionToolBase; import com.wetoband.template.AppConfig; import com.wetoband.template.entity.*; @@ -24,7 +23,6 @@ import java.util.*; * */ public class ToolTemplateAction extends ActionToolBase { - public final static ApplicationContext IOC = AppConfig.initApplicationContext(); //获取service实例 HomeWorkService homeWorkService=IOC.getBean(HomeWorkServiceImpl.class); @@ -77,19 +75,24 @@ public class ToolTemplateAction extends ActionToolBase { } @Action - public R getWrongQuestion(HttpServletRequest request) throws Exception { - Integer student_id =Integer.parseInt(request.getParameter("student_id")); - List wrongQuestion = wrongQuestionService.getWrongQuestion(student_id); - return R.ok().put("data",wrongQuestion); - } + public R getWrongQuestion(HttpServletRequest request) throws Exception { + Integer student_id =Integer.parseInt(request.getParameter("student_id")); + List wrongQuestion = wrongQuestionService.getWrongQuestion(student_id); + return R.ok().put("data",wrongQuestion); + } //提交作业（简答题） @Action public R submitHomework(HttpServletRequest request) throws Exception { String userAnswers = request.getParameter("userAnswers"); + // 解析 JSON 字符串为 Map Map> userAnswersMap = parseUserAnswers(userAnswers); System.out.println("Parsed Map: " + userAnswersMap); + String a = userAnswersMap.get("1").toString(); + System.out.println("1:"+a); + System.out.println("2:"+userAnswersMap.get("2")); + Integer studentId =Integer.parseInt(request.getParameter("student_id")); Integer homeworkId =Integer.parseInt(request.getParameter("homework_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 313d557c59b7591cd15d00f71f3366a0128039f9..6438ee138ef8126e297491d427d65cdae4e0880e 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -52,9 +52,13 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa @Override public List getHomeWork(Connection connection, int id) throws SQLException { // SQL语句 - String sql = "SELECT homework.* FROM homework JOIN homework_student " + - "ON homework.homework_id = homework_student.homework_id JOIN student ON " + - "homework_student.student_id = student.id WHERE student.id = ?"; + String sql = "SELECT homework.*, teacher.name, submit.submitStatus " + + "FROM homework " + + "JOIN homework_student ON homework.homework_id = homework_student.homework_id " + + "JOIN student ON homework_student.student_id = student.id " + + "JOIN teacher ON homework.teacher_id = teacher.id " + + "JOIN submit ON homework_student.student_id = submit.student_id AND homework.homework_id = submit.homework_id " + + "WHERE student.id = ?"; List homeworkList = new ArrayList<>(); try (PreparedStatement pstm = connection.prepareStatement(sql)) { @@ -63,13 +67,18 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa 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")); + if (rs.getInt("submitStatus") == 0){ + homework.setSubmitStatus("未提交"); + }else { + homework.setSubmitStatus("已提交"); + } homeworkList.add(homework); } } diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java index c450bd73d81d77a8cd3d420c510b1d49476fe599..bc94be6bdaa46d9fc2c8b92aeaee66b57b472137 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java +++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java @@ -27,4 +27,7 @@ public class HomeWork { @Column(name = "teacher_id") private Integer teacher_id; + private String teacher_name; + private String submitStatus; + } diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties index 5842d6bea96912e1b52549e8070773e0503f1b9a..ccd88d612c859fdfc86422d0a670134ef659e55e 100644 --- a/HomeWork-java/target/classes/config.properties +++ b/HomeWork-java/target/classes/config.properties @@ -34,5 +34,7 @@ GET_SWAP_VALUE_PORT=6666 - +REDIS_HOST=8.138.182.34 +REDIS_PORT=6379 +REDIS_PASSWORD=123456 diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties index 5842d6bea96912e1b52549e8070773e0503f1b9a..1b067acb35011027ebec832bea924a16fdedbe42 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_PORT=6379 +REDIS_PASSWORD=123456 diff --git a/HomeWork-vite/src/App.vue b/HomeWork-vite/src/App.vue index e7f6c72e30633d83dc583b05383ede1891dcc0ad..d037bc8d28d3a57756ea84eec9c7e11e0aa0a936 100644 --- a/HomeWork-vite/src/App.vue +++ b/HomeWork-vite/src/App.vue @@ -4,6 +4,7 @@

作业系统

+ @@ -21,7 +22,12 @@ import Sidebar from './components/Sidebar.vue'; import { onBeforeMount, provide, ref } from 'vue'; import { getRtParam } from './base/constant'; import { RouterView } from 'vue-router'; +import { useRouter } from 'vue-router'; const runToolParam = ref(''); + +const toHome = () => { + +}; onBeforeMount(() => { runToolParam.value = getRtParam() || ''; if (/^\{.*\}$/.test(runToolParam.value)) { diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue index a35f20be122089d6aef4891926767e08119e8bfa..304b42402dea2acaeee20789db0aebdf58719fd6 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue @@ -28,11 +28,11 @@ }" :cell-style="{ textAlign: 'center' }"> - - - - - + + + + + 上传作业 @@ -51,14 +51,14 @@