From c77b8c9a14bfac675d2ae08579634594a456db36 Mon Sep 17 00:00:00 2001 From: "YOHO\\20373" <2037305722@qq.com> Date: Mon, 26 May 2025 11:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=AF=95?= =?UTF-8?q?=E5=8D=B7=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paper/EducationPaperTaskController.java | 5 ---- .../question/ExamQuestionController.java | 3 +-- .../dal/dataobject/EducationPaperParam.java | 11 +++++++- .../paper/EducationPaperTaskServiceImpl.java | 4 +++ .../question/ExamQuestionServiceImpl.java | 2 +- .../mapper/exam/EducationPaperParamMapper.xml | 26 ++++++++++++++----- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java index 4f730022..3df38d23 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java @@ -38,13 +38,8 @@ public class EducationPaperTaskController @GetMapping("/list") public CommonResult> list(PaperTaskPageVo educationPaperTask) { - PageResult pageResult = educationPaperTaskService.selectEducationPaperTaskList(educationPaperTask); - - - return CommonResult.success(BeanUtils.toBean(pageResult, EducationPaperTask.class)); - } /** * 查询试卷任务列表（学生端） diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/question/ExamQuestionController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/question/ExamQuestionController.java index afafe917..fb85b019 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/question/ExamQuestionController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/question/ExamQuestionController.java @@ -140,7 +140,6 @@ public class ExamQuestionController @PostMapping public CommonResult add(@RequestBody ExamQuestion examQuestion) { - System.out.println(examQuestion.getContent()+"content"); return success(examQuestionService.insertExamQuestion(examQuestion)); } @@ -151,7 +150,7 @@ public class ExamQuestionController @PutMapping public CommonResult edit(@RequestBody ExamQuestion examQuestion) { - return success(examQuestionService.updateExamQuestion(examQuestion)); + return success(examQuestionService.updateExamQuestion(examQuestion)); } /** diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java index 1f123d6f..628e5ba3 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java @@ -82,7 +82,16 @@ public class EducationPaperParam private String isSession; private String isTime; + // 默认 1 小时 @JsonFormat(pattern = "HH:mm:ss", timezone = "Asia/Shanghai") - private Time examTime = Time.valueOf("01:00:00"); // 默认 1 小时 + private Time examTime = Time.valueOf("01:00:00"); + //考试提醒 + private String warn; + //文件共享 + private String isFile; + //禁用外网 + private String isNet; + //禁止截屏 + private String isScreen; } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java index 9bd687db..93fee8d8 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java @@ -140,6 +140,10 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService educationPaperParam.setUploadTime("5"); educationPaperParam.setIsDel("0"); educationPaperParam.setIsSession("1"); + educationPaperParam.setIsFile("1"); + educationPaperParam.setIsNet("1"); + educationPaperParam.setIsScreen("1"); + educationPaperParam.setIsContent("1"); if ("1".equals(educationPaperTask.getTaskType())){ educationPaperParam.setIsRepeat("1"); educationPaperParam.setIsAnswer("1"); diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java index 3d74924b..b02dfc69 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java @@ -731,7 +731,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService } examQuestionAnswer.setContent(content); examQuestionAnswerList.add(examQuestionAnswer); - // TODO: 保存到集合或数据库 + } System.out.println(examQuestionAnswerList); diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperParamMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperParamMapper.xml index 548212df..fdb1b247 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperParamMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperParamMapper.xml @@ -15,11 +15,8 @@ - - - @@ -28,10 +25,16 @@ + + + + + + - select param_id, task_id, is_number,is_content,is_answer_id,is_exam_password, exam_password, usb, save_grades, driver, directory, upload_time, is_time,exam_time,is_del,is_repeat ,is_answer,is_look,is_connect,is_session from education_paper_param + select param_id, task_id, is_number,is_content,is_answer_id,is_exam_password, exam_password, usb, save_grades, driver, directory, upload_time, is_time,exam_time,is_del,is_repeat ,is_answer,is_look,is_connect,is_session,warn,is_file,is_net,is_screen from education_paper_param