diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index 39ed1f9936d5c3406d25e973f9c1345b9089d8ba..a45303d6516abd8c4d62b80c0e06c33f14b41aec 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -5,24 +5,24 @@ import cn.hutool.http.HttpResponse; import com.fy.basejar.tool.ActionToolBase; import com.wetoband.template.AppConfig; import com.wetoband.template.entity.HomeWork; + +import com.wetoband.template.entity.Question; import com.wetoband.template.entity.User; import com.wetoband.template.entity.WrongQuestion; + import com.wetoband.template.service.HomeWorkService; +import com.wetoband.template.service.QuestionService; import com.wetoband.template.service.UserService; import com.wetoband.template.service.WrongQuestionService; import com.wetoband.template.service.impl.HomeWorkServiceImpl; +import com.wetoband.template.service.impl.QuestionServiceImpl; import com.wetoband.template.service.impl.UserServiceImpl; import com.wetoband.template.service.impl.WrongQuestionServiceImpl; import com.wetoband.template.util.R; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,6 +36,7 @@ public class ToolTemplateAction extends ActionToolBase { //获取service实例 HomeWorkService homeWorkService=IOC.getBean(HomeWorkServiceImpl.class); WrongQuestionService wrongQuestionService=IOC.getBean(WrongQuestionServiceImpl.class); + QuestionService questionService=IOC.getBean(QuestionServiceImpl.class); UserService userService=IOC.getBean(UserServiceImpl.class); @Action @@ -95,10 +96,17 @@ public class ToolTemplateAction extends ActionToolBase { return R.ok().put("data",wrongQuestion); } - - - - + //提交疑难点 + @Action + public R submitQuestions(HttpServletRequest request) throws Exception { + Question question = new Question(); + question.setHomework_id(Integer.parseInt(request.getParameter("homework_id"))); + question.setStudent_id(Integer.parseInt(request.getParameter("student_id"))); +// question.setSubmit_time(new Date(request.getParameter("submit_time"))); + question.setContent(request.getParameter("content")); + questionService.submitQuestions(question); + return R.ok().message("请求成功"); + } public static String runTool(String toolId, String action, Map map, String bandId) { HashMap params = new HashMap<>(); diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java index 38e3ddc700955f98add9380e401f73b507578a9d..a511ae4a11639e3407cfd16c80053d7be1264a47 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java @@ -14,5 +14,4 @@ public interface HomeWorkDao extends IBaseDao { List getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException; List getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException; - } diff --git a/HomeWork-java/src/com/wetoband/template/dao/QuestionDao.java b/HomeWork-java/src/com/wetoband/template/dao/QuestionDao.java new file mode 100644 index 0000000000000000000000000000000000000000..f2beb66b8fa40e55222bd3a1f8bdc98afc5301b3 --- /dev/null +++ b/HomeWork-java/src/com/wetoband/template/dao/QuestionDao.java @@ -0,0 +1,9 @@ +package com.wetoband.template.dao; + +import com.wetoband.template.entity.Question; + +import java.sql.Connection; + +public interface QuestionDao { + public void submitQuestions(Connection connection, Question question); +} diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2d93fa58caeb506e0ce3555a479ac225285c8909 --- /dev/null +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/QuestionDaoImpl.java @@ -0,0 +1,27 @@ +package com.wetoband.template.dao.impl; + +import com.wetoband.template.dao.QuestionDao; +import com.wetoband.template.entity.HomeWork; +import com.wetoband.template.entity.Question; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import java.sql.*; + +@Repository +public class QuestionDaoImpl implements QuestionDao { + + @Override + public void submitQuestions(Connection connection, Question question) { + String sql = "INSERT INTO question (homework_id,content,student_id,teacher_id) VALUES (?,?,?,(SELECT teacher_id FROM homework WHERE homework_id = ?))" ; + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + pstm.setInt(1, question.getHomework_id()); + pstm.setString(2, question.getContent()); + pstm.setInt(3, question.getStudent_id()); + pstm.setInt(4, question.getHomework_id()); + pstm.executeUpdate(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } +} diff --git a/HomeWork-java/src/com/wetoband/template/entity/Question.java b/HomeWork-java/src/com/wetoband/template/entity/Question.java index 1f06ea97f1b479f9ba4c2604a601b2450afba595..02d2b4177de98416d46401a0abd34007a2ebaa09 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/Question.java +++ b/HomeWork-java/src/com/wetoband/template/entity/Question.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; +import java.util.Date; @Data @Table(name = "question") @@ -15,11 +16,11 @@ public class Question { @Column(name = "student_id") private Integer student_id; @Column(name = "teacher_id") - private Integer teacher; + private Integer teacher_id; @Column(name = "homework_id") private Integer homework_id; @Column(name = "submit_time") - private String submit_time; + private Date submit_time; @Column(name = "content") private String content; @Column(name = "solve_status") diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java index 55d4ba0f8aa626cfd751a86769b29be4d71c4c62..4371437d9ee5800244c184f185c6615d34cc74b0 100644 --- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java +++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java @@ -2,10 +2,12 @@ package com.wetoband.template.service; import com.wetoband.template.entity.HomeWork; + import java.sql.Connection; import java.sql.SQLException; import java.util.List; + public interface HomeWorkService { //public HomeWork getHomeWorkById(int id) throws Exception; public List getHomeWork( int id) throws Exception; diff --git a/HomeWork-java/src/com/wetoband/template/service/QuestionService.java b/HomeWork-java/src/com/wetoband/template/service/QuestionService.java new file mode 100644 index 0000000000000000000000000000000000000000..0b309cc83c887beb6c56e4fef8054c3c97e54f49 --- /dev/null +++ b/HomeWork-java/src/com/wetoband/template/service/QuestionService.java @@ -0,0 +1,7 @@ +package com.wetoband.template.service; + +import com.wetoband.template.entity.Question; + +public interface QuestionService { + public void submitQuestions(Question question) 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 2920faec693333b8b98390bcc0574fe9ed689cdd..378649a85eadff9c6239efaa1f7cdbf8321ebe4d 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Connection; -import java.sql.DriverManager; + import java.util.List; @Service @@ -27,7 +27,7 @@ public class HomeWorkServiceImpl implements HomeWorkService { public List getHomeWork(int id) throws Exception { final Connection connection = ActionToolBase.getDBConnection(); - return homeWorkDao.getHomeWork(connection,id); + return homeWorkDao.getHomeWork(connection,id); } public List getHomeWorkByCourse(String course_name,int id) throws Exception { diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/QuestionServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/QuestionServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c839733bf3d9a4648a279066836d2eb5d17610ba --- /dev/null +++ b/HomeWork-java/src/com/wetoband/template/service/impl/QuestionServiceImpl.java @@ -0,0 +1,23 @@ +package com.wetoband.template.service.impl; + +import com.fy.basejar.tool.ActionToolBase; +import com.wetoband.template.dao.QuestionDao; +import com.wetoband.template.entity.Question; +import com.wetoband.template.service.QuestionService; +import lombok.NoArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.sql.Connection; + +@Service +@NoArgsConstructor +public class QuestionServiceImpl implements QuestionService { + @Autowired + private QuestionDao questionDao; + @Override + public void submitQuestions(Question question) throws Exception { + final Connection connection = ActionToolBase.getDBConnection(); + questionDao.submitQuestions(connection, question); + } +} diff --git a/HomeWork-vite/src/router/index.js b/HomeWork-vite/src/router/index.js index 2353eeffeb797ec7b047c1e9d6f04073f0952f93..f3706e7886e833762a750ddfd5a1d998c4df92be 100644 --- a/HomeWork-vite/src/router/index.js +++ b/HomeWork-vite/src/router/index.js @@ -2,8 +2,9 @@ import { createRouter, createWebHashHistory } from 'vue-router'; import Home from '@/views/Home/index.vue'; import HomeWorkManager from '@/views/HomeWorkManager/index.vue'; import WrongManager from '@/views/WrongManager/index.vue'; -import component from 'element-plus/es/components/tree-select/src/tree-select-option.mjs'; + import uploadHomeWork from '@/views/HomeWorkManager/uploadHomeWork.vue'; +import MultipleChoiceQuestions from '@/views/HomeWorkManager/MultipleChoiceQuestions.vue'; const routes = [ { path: '/', @@ -24,7 +25,17 @@ const routes = [ path: '/uploadHomeWork', name: 'uploadHomeWork', component: uploadHomeWork - } + }, + { + path: '/MultipleChoiceQuestions', + name: 'MultipleChoiceQuestions', + component: MultipleChoiceQuestions + }, + // { + // path: '/:pathMatch(.*)*', + // name: 'NotFound', + // // component: () => import('@/views/NotFound.vue') + // } ]; const router = createRouter({ diff --git a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue new file mode 100644 index 0000000000000000000000000000000000000000..447024d05369dd6775a64cbe968e74863f6958db --- /dev/null +++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue @@ -0,0 +1,73 @@ + + + \ No newline at end of file