From 6dee2f5d35b44a046d0f14984d72d7b4e2c600bb Mon Sep 17 00:00:00 2001 From: Sakura <2337674687@qq.com> Date: Tue, 25 Feb 2025 14:15:51 +0800 Subject: [PATCH] 2.25.14.15 --- .../template/action/ToolTemplateAction.java | 18 ++++++++++--- .../template/dao/impl/NoticeDaoImpl.java | 27 +++++++++++++++++-- .../dao/impl/WrongQuestionDaoImpl.java | 7 ++--- .../com/wetoband/template/entity/Notice.java | 3 +++ .../template/entity/wrongQuestionSubmit.java | 5 ++-- .../service/WrongQuestionService.java | 2 +- .../impl/WrongQuestionServiceImpl.java | 4 +-- .../src/views/WrongManager/WrongQustions.vue | 7 ++--- 8 files changed, 56 insertions(+), 17 deletions(-) diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index 914307b..7680061 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -34,6 +34,8 @@ public class ToolTemplateAction extends ActionToolBase { FileUploadService fileUploadService= IOC.getBean(FileUploadService.class); TroubleshootingService troubleshootingService=IOC.getBean(TroubleshootingServiceImpl.class); QuestionService questionService=IOC.getBean(QuestionServiceImpl.class); + NoticeService noticeService=IOC.getBean(NoticeServiceImpl.class); + @Action public R get(HttpServletRequest request ) throws Exception { return R.ok().put("msg", "Hello World").message("GET请求成功"); @@ -116,11 +118,12 @@ public class ToolTemplateAction extends ActionToolBase { Integer studentId =Integer.parseInt(request.getParameter("student_id")); Integer homeworkId =Integer.parseInt(request.getParameter("homework_id")); //获取提交时间设置为年月日格式 - String addTimeStr = request.getParameter("addTime"); + String submitTimeStr = request.getParameter("submitTime"); + System.out.println(submitTimeStr); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - Date addTimeDate = sdf.parse(addTimeStr); + Date submitTimeDate = sdf.parse(submitTimeStr); // homeWorkService.submitHomework(studentId,homeworkId,addTimeDate,userAnswersMap); - wrongQuestionService.submitWrongQuestion(studentId,homeworkId,addTimeDate,userAnswersMap); + wrongQuestionService.submitWrongQuestion(studentId,homeworkId,submitTimeDate,userAnswersMap); return R.ok().message("请求成功"); } @@ -148,7 +151,6 @@ public class ToolTemplateAction extends ActionToolBase { return R.ok().put("data",question); } - //文件上传miniIo @Action public R fileUploadService(HttpServletRequest request) throws ServletException, IOException {//前端要传一个名字叫 file 的参数 @@ -157,6 +159,12 @@ public class ToolTemplateAction extends ActionToolBase { return R.ok().put("data",filePart);//返回一个fileurl给前端 } + @Action + public R getNotice(HttpServletRequest request) throws Exception { + int student_id =Integer.parseInt(request.getParameter("student_id")); + List Notices = noticeService.getNotice(student_id); + return R.ok().put("data",Notices); + } public static String runTool(String toolId, String action, Map map, String bandId) { HashMap params = new HashMap<>(); @@ -175,6 +183,8 @@ public class ToolTemplateAction extends ActionToolBase { } + + //json转化成map方法 private Map> parseUserAnswers(String userAnswers) { Map> userAnswersMap = new HashMap<>(); diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/NoticeDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/NoticeDaoImpl.java index ded182e..aee99d6 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/NoticeDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/NoticeDaoImpl.java @@ -2,16 +2,39 @@ package com.wetoband.template.dao.impl; import com.wetoband.template.dao.NoticeDao; import com.wetoband.template.entity.Notice; +import com.wetoband.template.entity.Question; +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 NoticeDaoImpl implements NoticeDao { @Override public List getNotice(Connection connection, int usr_id) throws SQLException { - return null; + ArrayList Notices = new ArrayList<>(); + String sql = "SELECT * FROM notice WHERE student_id = 1 ORDER BY submit_time ASC"; + + try (PreparedStatement pstm = connection.prepareStatement(sql)) { + try (ResultSet rs = pstm.executeQuery()) { + while (rs.next()) { + Notice notice = new Notice(); + notice.setContent(rs.getString("content")); + notice.setType(rs.getInt("type")); + notice.setIs_read(rs.getInt("is_read")); + notice.setSubmit_time(rs.getString("submit_time")); + Notices.add(notice); + } + } + + } catch (SQLException e) { + throw new RuntimeException(e); + } + return Notices; } } 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 b5e4bba..15009f1 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/WrongQuestionDaoImpl.java @@ -16,7 +16,7 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao { @Override public List getWrongHomework(Connection connection, int student_id) throws SQLException { // SQL语句 - String sql = "SELECT wrongquestionsubmit.student_id, homework.homework_id, addTime, reviewStatus, homework.homework_name, homework.course_name, submit.score " + + String sql = "SELECT wrongquestionsubmit.student_id, homework.homework_id, wrongquestionsubmit.addTime, reviewStatus, homework.homework_name, homework.course_name, submit.score " + "FROM wrongquestionsubmit " + "JOIN homework ON homework.homework_id = wrongquestionsubmit.homework_id " + "LEFT JOIN submit ON submit.homework_id = wrongquestionsubmit.homework_id AND submit.student_id = wrongquestionsubmit.student_id " + @@ -28,7 +28,8 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao { while (rs.next()) { wrongQuestionSubmit wrongQuestionSubmit = new wrongQuestionSubmit(); wrongQuestionSubmit.setHomework_id(rs.getInt("homework_id")); - wrongQuestionSubmit.setAddTime(rs.getTime("addTime")); + System.out.println(rs.getTime("addTime")); + wrongQuestionSubmit.setAddTime(rs.getString("addTime")); if (rs.getInt("reviewStatus") == 1){ wrongQuestionSubmit.setReviewStatus("已复习"); }else{ @@ -87,7 +88,7 @@ public class WrongQuestionDaoImpl implements WrongQuestionDao { "WHERE student_id = ? AND homework_id = ? "; try (PreparedStatement pstm = connection.prepareStatement(sql)) { pstm.setString(1, wrongQuestionSubmit.getAnswer()); - pstm.setTimestamp(2, new Timestamp(wrongQuestionSubmit.getAddTime().getTime())); + pstm.setTimestamp(2, new Timestamp(wrongQuestionSubmit.getSubmitTime().getTime())); pstm.setInt(3, 1); pstm.setInt(4, wrongQuestionSubmit.getHomework_id()); pstm.setInt(5, wrongQuestionSubmit.getStudent_id()); diff --git a/HomeWork-java/src/com/wetoband/template/entity/Notice.java b/HomeWork-java/src/com/wetoband/template/entity/Notice.java index a392612..6397c62 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/Notice.java +++ b/HomeWork-java/src/com/wetoband/template/entity/Notice.java @@ -1,8 +1,11 @@ package com.wetoband.template.entity; +import lombok.Data; + import javax.persistence.Column; import javax.persistence.Table; +@Data @Table(name = "notice") public class Notice { @Column(name = "student_id") diff --git a/HomeWork-java/src/com/wetoband/template/entity/wrongQuestionSubmit.java b/HomeWork-java/src/com/wetoband/template/entity/wrongQuestionSubmit.java index 7b9b451..ed60900 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/wrongQuestionSubmit.java +++ b/HomeWork-java/src/com/wetoband/template/entity/wrongQuestionSubmit.java @@ -21,8 +21,9 @@ public class wrongQuestionSubmit { @Column(name = "answer") private String answer; @Column(name = "addTime") - private Date addTime; - + private String addTime; + @Column(name = "submitTime") + private Date submitTime; private String reviewStatus; private String homework_name; private String course_name; diff --git a/HomeWork-java/src/com/wetoband/template/service/WrongQuestionService.java b/HomeWork-java/src/com/wetoband/template/service/WrongQuestionService.java index abc3bd7..07f69bd 100644 --- a/HomeWork-java/src/com/wetoband/template/service/WrongQuestionService.java +++ b/HomeWork-java/src/com/wetoband/template/service/WrongQuestionService.java @@ -12,5 +12,5 @@ import java.util.Map; public interface WrongQuestionService { public List getWrongHomework(int student_id) throws Exception; List getWrongQuestion(int homework_id,int student_id) throws Exception; - void submitWrongQuestion(Integer student_id, Integer homework_id, Date addTimeDate, Map> userAnswersMap) throws Exception; + void submitWrongQuestion(Integer student_id, Integer homework_id, Date submitTimeDate, Map> userAnswersMap) throws Exception; } diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/WrongQuestionServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/WrongQuestionServiceImpl.java index bd8de6c..f9e2cb7 100644 --- a/HomeWork-java/src/com/wetoband/template/service/impl/WrongQuestionServiceImpl.java +++ b/HomeWork-java/src/com/wetoband/template/service/impl/WrongQuestionServiceImpl.java @@ -34,7 +34,7 @@ public class WrongQuestionServiceImpl implements WrongQuestionService { } @Override - public void submitWrongQuestion(Integer student_id, Integer homework_id, Date addTimeDate, Map> userAnswersMap) throws Exception { + public void submitWrongQuestion(Integer student_id, Integer homework_id, Date submitTimeDate, Map> userAnswersMap) throws Exception { final Connection connection = ActionToolBase.getDBConnection(); wrongQuestionSubmit wrongQuestionSubmit = new wrongQuestionSubmit(); String redisKey = "w-" + homework_id+ "-" +student_id ;//设置key @@ -55,7 +55,7 @@ public class WrongQuestionServiceImpl implements WrongQuestionService { } wrongQuestionSubmit.setStudent_id(student_id); wrongQuestionSubmit.setHomework_id(homework_id); - wrongQuestionSubmit.setAddTime(addTimeDate); + wrongQuestionSubmit.setSubmitTime(submitTimeDate); wrongQuestionSubmit.setAnswer(redisKey); } catch (Exception e) { e.printStackTrace(); diff --git a/HomeWork-vite/src/views/WrongManager/WrongQustions.vue b/HomeWork-vite/src/views/WrongManager/WrongQustions.vue index 5ff0c2b..f7683e1 100644 --- a/HomeWork-vite/src/views/WrongManager/WrongQustions.vue +++ b/HomeWork-vite/src/views/WrongManager/WrongQustions.vue @@ -42,7 +42,7 @@ import { onMounted, reactive, ref, watch, toRaw } from 'vue'; import { HttpClient } from '@/network/HttpClient'; import { useRoute } from 'vue-router'; const questions = reactive([]); -const addTime = ref('') +const submitTime = ref('') const answered = ref(0); const homework_id = ref(null); const route = useRoute(); @@ -100,7 +100,8 @@ const getCurrentTime = () => { const day = String(now.getDate()).padStart(2, '0'); const hours = String(now.getHours()).padStart(2, '0'); const minutes = String(now.getMinutes()).padStart(2, '0'); - addTime.value = `${year}-${month}-${day} ${hours}:${minutes}`; + submitTime.value = `${year}-${month}-${day} ${hours}:${minutes}`; + console.log(submitTime.value) } const submitWrongQuestion = async () => { // 将响应式对象转换为普通对象 @@ -111,7 +112,7 @@ const submitWrongQuestion = async () => { await HttpClient.post('submitWrongQuestion', { homework_id: homework_id.value, student_id: 1, - addTime: addTime.value, + submitTime: submitTime.value, userAnswers: JSON.stringify(userAnswersArray) }).then(res => { console.log(res.data.data); -- Gitee