From 0c6eeaafb066435f04a9fc2bbc3f84538f6586fe Mon Sep 17 00:00:00 2001 From: Sakura <2337674687@qq.com> Date: Tue, 11 Mar 2025 12:49:49 +0800 Subject: [PATCH 1/2] 3.11 --- .../template/action/ToolTemplateAction.java | 55 +++++-------------- .../template/aspects/LogOperateAspect.java | 2 - .../wetoband/template/dao/HomeWorkDao.java | 1 + .../template/dao/impl/HomeWorkDaoImpl.java | 29 +++++++++- .../wetoband/template/entity/HomeWork.java | 1 + .../views/HomeWorkManager/HomeWorkManger.vue | 37 +++++++++---- .../MultipleChoiceQuestions.vue | 10 +++- 7 files changed, 79 insertions(+), 56 deletions(-) diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java index f88a00f..3a8c133 100644 --- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java +++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java @@ -10,14 +10,8 @@ import com.wetoband.template.entity.*; import com.wetoband.template.service.*; import com.wetoband.template.service.impl.*; import com.wetoband.template.util.R; -import lombok.SneakyThrows; -import org.jetbrains.annotations.NotNull; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; -import java.io.IOException; -import java.sql.Connection; import java.text.SimpleDateFormat; import java.util.*; @@ -32,7 +26,6 @@ import java.util.*; TroubleshootingService troubleshootingService=IOC.getBean(TroubleshootingServiceImpl.class); QuestionService questionService=IOC.getBean(QuestionServiceImpl.class); NoticeService noticeService=IOC.getBean(NoticeServiceImpl.class); - WordService wordService = IOC.getBean(WordServiceImpl.class); @Action @@ -73,6 +66,7 @@ import java.util.*; @Action public R getHomeWork(HttpServletRequest request) throws Exception { Integer id =Integer.parseInt(request.getParameter("id")); + List homeWork = homeWorkService.getHomeWork(id); return R.ok().put("data",homeWork); } @@ -95,7 +89,6 @@ import java.util.*; //提交作业（简答题） @Action public R submitHomework(HttpServletRequest request) throws Exception { - String userAnswersJson = request.getParameter("userAnswersJson"); Integer studentId =Integer.parseInt(request.getParameter("student_id")); Integer homeworkId =Integer.parseInt(request.getParameter("homework_id")); @@ -110,8 +103,6 @@ import java.util.*; //提交错题答案 @Action public R submitWrongQuestion(HttpServletRequest request) throws Exception { - - String userAnswersJson = request.getParameter("userAnswersJson"); Integer studentId =Integer.parseInt(request.getParameter("student_id")); Integer homeworkId =Integer.parseInt(request.getParameter("homework_id")); @@ -125,20 +116,20 @@ import java.util.*; } //提交疑难点 - @Action - public R submitTroubleshooting(HttpServletRequest request) throws Exception { - Troubleshooting troubleshooting = new Troubleshooting(); - troubleshooting.setQuestion_id(Integer.parseInt(request.getParameter("question_id"))); - troubleshooting.setHomework_id(Integer.parseInt(request.getParameter("homework_id"))); - troubleshooting.setStudent_id(Integer.parseInt(request.getParameter("student_id"))); - troubleshooting.setContent(request.getParameter("content")); - String submitTimeStr = request.getParameter("submitTime"); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - Date submitTimeDate = sdf.parse(submitTimeStr); - troubleshooting.setSubmit_time(submitTimeDate); - troubleshootingService.submitTroubleshooting(troubleshooting); - return R.ok().message("请求成功"); - } +// @Action +// public R submitTroubleshooting(HttpServletRequest request) throws Exception { +// Troubleshooting troubleshooting = new Troubleshooting(); +// troubleshooting.setQuestion_id(Integer.parseInt(request.getParameter("question_id"))); +// troubleshooting.setHomework_id(Integer.parseInt(request.getParameter("homework_id"))); +// troubleshooting.setStudent_id(Integer.parseInt(request.getParameter("student_id"))); +// troubleshooting.setContent(request.getParameter("content")); +// String submitTimeStr = request.getParameter("submitTime"); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); +// Date submitTimeDate = sdf.parse(submitTimeStr); +// troubleshooting.setSubmit_time(submitTimeDate); +// troubleshootingService.submitTroubleshooting(troubleshooting); +// return R.ok().message("请求成功"); +// } //获取题目 @Action @@ -157,22 +148,6 @@ import java.util.*; } - -// //文件上传miniIo -// @Action -// public R fileUploadService(HttpServletRequest request) throws ServletException, IOException {//前端要传一个名字叫 file 的参数 -// MultipartFile filePart = (MultipartFile) request.getPart("file"); -//// String fileUrl = fileUploadService.fileUpload(filePart) ; -// 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<>(); params.put("toolID", toolId); diff --git a/HomeWork-java/src/com/wetoband/template/aspects/LogOperateAspect.java b/HomeWork-java/src/com/wetoband/template/aspects/LogOperateAspect.java index 69a4edd..42bcf67 100644 --- a/HomeWork-java/src/com/wetoband/template/aspects/LogOperateAspect.java +++ b/HomeWork-java/src/com/wetoband/template/aspects/LogOperateAspect.java @@ -28,8 +28,6 @@ import java.util.List; public class LogOperateAspect { private static final Logger logger = LoggerFactory.getLogger(LogOperateAspect.class); - - /** * 描述：日志操作 * diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java index 288bbad..155c613 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java +++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java @@ -17,4 +17,5 @@ public interface HomeWorkDao extends IBaseDao { //提交作业 void submitHomework(Connection connection, Submit submitHomework); + int getCount(Connection connection, int id) throws SQLException; } 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 2d6419f..7adf11e 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -14,18 +14,43 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa public HomeWorkDaoImpl() throws Exception { } + @Override + public int getCount(Connection connection, int id) throws SQLException { + int count = 0; + String sql ="SELECT COUNT(*)\n" + + "FROM\n" + + " homework\n" + + " JOIN teacher ON homework.teacher_id = teacher.id\n" + + " LEFT JOIN submit ON submit.student_id = 1 \n" + + " AND homework.homework_id = submit.homework_id;"; + try (PreparedStatement pstm = connection.prepareStatement(sql)){ + pstm.setInt(1, id); + try (ResultSet rs = pstm.executeQuery()){ + while (rs.next()){ + count = rs.getInt(1); + } + } + }catch (SQLException e){ + throw e; + } + return count; + } + @Override public List getHomeWork(Connection connection, int id) throws SQLException { + + // SQL语句 String sql ="SELECT homework.*,teacher.name , submit.submitStatus FROM homework " + "JOIN teacher ON homework.teacher_id = teacher.id " + "LEFT JOIN submit ON submit.student_id = ? AND homework.homework_id = submit.homework_id "; + List homeworkList = new ArrayList<>(); try (PreparedStatement pstm = connection.prepareStatement(sql)) { pstm.setInt(1, id); try (ResultSet rs = pstm.executeQuery()) { + HomeWork homework = new HomeWork(); while (rs.next()) { - HomeWork homework = new HomeWork(); homework.setHomework_id(rs.getInt("homework_id")); homework.setType(rs.getInt("type")); homework.setHomework_describe(rs.getString("homeworkDescribe")); @@ -167,6 +192,8 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa throw new RuntimeException("Failed to submit homework", e); } } + + } diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java index bc94be6..5df46d6 100644 --- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java +++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java @@ -29,5 +29,6 @@ public class HomeWork { private String teacher_name; private String submitStatus; + private int count; } diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue index 664e33d..97582b8 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue @@ -12,22 +12,21 @@ - + 查看错题 - + }"> @@ -47,9 +46,20 @@
- + @current-change="handleCurrentChange" class="mt-4" /> --> + + +
@@ -65,12 +75,17 @@ import { HttpClient } from '../../network/HttpClient' const input1 = ref('') const selectedFilter = ref('') const router = useRouter() -const currentPage = ref(1)//当前页 -const pageSize = ref(10)//每页显示条数 +const currentPage = ref(1) +const pageSize = ref(10) +const totalItems = ref(100) +const jumpPage = ref('') +// const currentPage = ref(1)//当前页 +// const pageSize = ref(10)//每页显示条数 // 每页条数变化时触发 const handleSizeChange = (val: number) => { console.log(`${val} items per page`) + } // 当前页变化时触发 const handleCurrentChange = (val: number) => { diff --git a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue index 297772a..999fe91 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/MultipleChoiceQuestions.vue @@ -48,7 +48,8 @@ - + {{ String.fromCharCode(65 + index) }}. @@ -58,7 +59,8 @@
- +
@@ -73,6 +75,10 @@ import { onMounted, reactive, ref, watch } from 'vue'; import { HttpClient } from '@/network/HttpClient'; import { useRoute } from 'vue-router'; +const currentPage = ref(1) +const pageSize = ref(10) +const totalItems = ref(100) +const jumpPage = ref('') const questions = reactive([]); const submitTime = ref('') const answered = ref(0); -- Gitee From cac09acbe2c61c522011c281b22749f8c4a4a925 Mon Sep 17 00:00:00 2001 From: Sakura <2337674687@qq.com> Date: Tue, 11 Mar 2025 16:08:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?3.11-=E5=88=86=E9=A1=B5=E5=99=A8=E5=AE=9E?= =?UTF-8?q?=E7=8E=B01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HomeworkManger/HomeworkTable.vue | 107 ------------------ 1 file changed, 107 deletions(-) delete mode 100644 HomeWork-vite/src/components/HomeworkManger/HomeworkTable.vue diff --git a/HomeWork-vite/src/components/HomeworkManger/HomeworkTable.vue b/HomeWork-vite/src/components/HomeworkManger/HomeworkTable.vue deleted file mode 100644 index c899560..0000000 --- a/HomeWork-vite/src/components/HomeworkManger/HomeworkTable.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - \ No newline at end of file -- Gitee