From 4f29b7f2decb20aafa44b4973d47a21103bc2617 Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Tue, 21 Jan 2025 22:59:16 +0800
Subject: [PATCH 1/4] 1.21

---
 HomeWork-vite/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HomeWork-vite/src/App.vue b/HomeWork-vite/src/App.vue
index cd32078..8a66803 100644
--- a/HomeWork-vite/src/App.vue
+++ b/HomeWork-vite/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <el-container class="layout">
+    <el-container>
       <!-- 头部 -->
       <el-header class="header">
         <h1>作业系统</h1>
-- 
Gitee


From fa92cdc3f7a23e4b8419d4111d01a94182ef8f8d Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Wed, 5 Feb 2025 17:03:06 +0800
Subject: [PATCH 2/4] 123

---
 .../com/wetoband/template/service/impl/HomeWorkServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

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 2b01a4e..2c19db5 100644
--- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
@@ -28,6 +28,7 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         return  homeWorkDao.getHomeWorkById(connection,id);
     }*/
 
+    
     public List<HomeWork> getHomeWork(int id) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
         return homeWorkDao.getHomeWork(connection,id);
-- 
Gitee


From 512254385125102a9a43c2ed4981660051c76c8c Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Thu, 6 Feb 2025 16:35:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/action/ToolTemplateAction.java   | 14 ++--
 .../template/dao/impl/HomeWorkDaoImpl.java    |  7 +-
 .../template/service/HomeWorkService.java     |  2 +-
 .../service/impl/HomeWorkServiceImpl.java     |  6 +-
 .../views/HomeWorkManager/uploadHomeWork.vue  | 68 ++++++++++++++-----
 5 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index 82fb312..15348d6 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -107,19 +107,20 @@ public class ToolTemplateAction extends ActionToolBase {
 
 
 
-    //提交作业
+    //提交作业（简答题）
     @Action
     public R submitHomework(HttpServletRequest request) throws Exception {
         Integer studentId =Integer.parseInt(request.getParameter("student_id"));
         Integer homeworkId =Integer.parseInt(request.getParameter("homework_id"));
         //获取提交时间设置为年月日格式
         String submitTimeStr = request.getParameter("submitTime");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Date submitTimeDate = sdf.parse(submitTimeStr);
 
         String text = request.getParameter("text");
-        Integer submitId = Integer.parseInt(request.getParameter("submit_id"));
-        homeWorkService.submitHomework(studentId,homeworkId,submitTimeDate,text,submitId);
+
+        homeWorkService.submitHomework(studentId,homeworkId,submitTimeDate,text);
         return R.ok().put("data",null);
     }
 
@@ -131,8 +132,11 @@ public class ToolTemplateAction extends ActionToolBase {
         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"));
+        String submitTimeStr = request.getParameter("submitTime");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        Date submitTimeDate = sdf.parse(submitTimeStr);
+        question.setSubmit_time(submitTimeDate);
         questionService.submitQuestions(question);
         return R.ok().message("请求成功");
     }
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 df0cda1..313d557 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
@@ -70,7 +70,6 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
                     homework.setFinish_time(rs.getString("finishTime"));
                     homework.setHomework_name(rs.getString("homework_name"));
                     homework.setCourse_name(rs.getString("course_name"));
-
                     homeworkList.add(homework);
                 }
             }
@@ -186,7 +185,7 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
                 "    submitStatus = ?, " +
                 "    correct = ?, "+
                 "    teacher_id = (SELECT teacher_id FROM homework WHERE homework_id = ?) " +
-                "WHERE submit_id = ?";
+                "WHERE student_id = ? AND homework_id = ? ";
 
         try (PreparedStatement pstm = connection.prepareStatement(sql)) {
             pstm.setInt(1, submitHomework.getHomeworkId());
@@ -196,7 +195,9 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
             pstm.setInt(5, submitHomework.getSubmitStatus());
             pstm.setInt(6, submitHomework.getCorrect());
             pstm.setInt(7,submitHomework.getHomeworkId());
-            pstm.setInt(8, submitId); // 最后一个参数是 submit_id，用于定位要更新的记录
+            //用于定位要更新的记录
+            pstm.setInt(8, submitHomework.getStudentId());
+            pstm.setInt(9, submitHomework.getHomeworkId());
             pstm.executeUpdate();//必不可少
         } catch (SQLException e) {
             throw new RuntimeException("Failed to submit homework", e);
diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
index 267e64e..4298d60 100644
--- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
+++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
@@ -16,5 +16,5 @@ public interface HomeWorkService {
     public List<HomeWork> getHomeWorkByTeacherName(String name,int id) throws Exception;
     public List<HomeWork> getHomeWorkByHomeworkName(String homework_name,int id) throws Exception;
 
-    void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, String text,Integer submitId) throws Exception;
+    void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, String text) 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 2c19db5..7f8fb80 100644
--- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
@@ -28,7 +28,7 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         return  homeWorkDao.getHomeWorkById(connection,id);
     }*/
 
-    
+    //获取所有作业
     public List<HomeWork> getHomeWork(int id) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
         return homeWorkDao.getHomeWork(connection,id);
@@ -50,7 +50,7 @@ public class HomeWorkServiceImpl implements HomeWorkService {
     }
 
     @Override
-    public void submitHomework(Integer studentId, Integer homeworkId, Date submitTimeDate, String text,Integer submitId) throws Exception {
+    public void submitHomework(Integer studentId, Integer homeworkId, Date submitTimeDate, String text) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
         Submit submitHomework = new Submit();
         submitHomework.setSubmitId(studentId);
@@ -60,7 +60,7 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         submitHomework.setCorrect(0);//设置批改状态为0
         submitHomework.setSubmitStatus(1);//设置提交状态为0
         submitHomework.setStudentId(studentId);
-        submitHomework.setSubmitId(submitId);
+//        submitHomework.setSubmitId(submitId);
         homeWorkDao.submitHomework(connection,submitHomework);
 
     }
diff --git a/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue b/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
index a408d51..902b23a 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/uploadHomeWork.vue
@@ -4,25 +4,19 @@
     <el-card style="max-height: 950px;overflow-y: scroll;">
 
       <div class="head">
-        <el-button @click="question = true" type="primary"><el-icon><ChatLineRound /></el-icon>疑难提问</el-button>
+        <el-button @click="question = true" type="primary"><el-icon>
+            <ChatLineRound />
+          </el-icon>疑难提问</el-button>
         <h3>作业名称</h3>
         <span style="font-size:small; color: rgba(0, 0, 0, 0.5)">作答时间：起始时间 至 结束时间 </span>
       </div>
 
-      <el-drawer v-model="question"
-                 title="提问"
-                 :with-header="true">
+      <el-drawer v-model="question" title="提问" :with-header="true">
 
-      <el-input
-      v-model="message"
-      style="width: 500px"
-      :autosize="{ minRows: 10, maxRows: 100 }"
-      type="textarea"
-      placeholder="请输入..."
-      
-    />
+        <el-input v-model="message" style="width: 500px" :autosize="{ minRows: 10, maxRows: 100 }" type="textarea"
+          placeholder="请输入..." />
 
-      <el-button @click="submit2" type="primary">提交</el-button>
+        <el-button @click="submitQuestion" type="primary">提交</el-button>
       </el-drawer>
 
       <div class="homework">
@@ -83,11 +77,13 @@
 
 <script lang="ts" setup>
 import { UploadFilled } from '@element-plus/icons-vue'
+import { HttpClient } from '@/network/HttpClient';
 import { ref } from 'vue'
 import { useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus'
 
 const answer = ref('')
+const submitTime = ref('')
 const options = ref(false)
 const router = useRouter()
 const question = ref(false)
@@ -98,13 +94,50 @@ const last = () => {
 }
 
 const submit = () => {
+  getCurrentTime()
+  submitHomework()
   ElMessage.success('文件已上传')
 }
 
-const submit2 = () =>{
+const submitQuestion = () => {
+  getCurrentTime()
+  submitQuestions()
   ElMessage.success('已提交')
- }
+}
 
+const getCurrentTime = () => {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  submitTime.value = `${year}-${month}-${day} ${hours}:${minutes}`;
+}
+const submitHomework = async () => {
+  await HttpClient.post('submitHomework', {
+    text: answer.value,
+    student_id: 1,
+    homework_id: 1,
+    submitTime: submitTime.value
+  }).then(res => {
+    console.log(res)
+  }).catch(err => {
+    console.log(err)
+  })
+}
+const submitQuestions = async () => {
+  await HttpClient.post('submitQuestions', {
+    content: message.value,
+    student_id: 1,
+    homework_id: 1,
+    submitTime: submitTime.value
+  }).then(res => {
+    console.log(res)
+  }).catch(err => {
+    console.log(err)
+  })
+}
 </script>
 
 <style scoped>
@@ -115,11 +148,11 @@ const submit2 = () =>{
   max-width: 1200px;
   margin-left: auto;
   margin-right: auto;
-  
+
 }
 
 .head {
- 
+
   height: auto;
   text-align: left;
 }
@@ -158,5 +191,4 @@ textarea {
   margin-bottom: 2%;
 
 }
-
 </style>
\ No newline at end of file
-- 
Gitee


From c293738c473cc572b5b4ce3ab80c100313cc1872 Mon Sep 17 00:00:00 2001
From: Sakura <2337674687@qq.com>
Date: Thu, 6 Feb 2025 16:44:11 +0800
Subject: [PATCH 4/4] 12.6

---
 .../src/com/wetoband/template/action/ToolTemplateAction.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index 15348d6..b26eb64 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -114,12 +114,9 @@ public class ToolTemplateAction extends ActionToolBase {
         Integer homeworkId =Integer.parseInt(request.getParameter("homework_id"));
         //获取提交时间设置为年月日格式
         String submitTimeStr = request.getParameter("submitTime");
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Date submitTimeDate = sdf.parse(submitTimeStr);
-
         String text = request.getParameter("text");
-
         homeWorkService.submitHomework(studentId,homeworkId,submitTimeDate,text);
         return R.ok().put("data",null);
     }
-- 
Gitee