【修改】试卷任务参数

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<PageResult<EducationPaperTask>> list(PaperTaskPageVo educationPaperTask)
     {
-
         PageResult<EducationPaperTask> pageResult = educationPaperTaskService.selectEducationPaperTaskList(educationPaperTask);
-
-
-
         return CommonResult.success(BeanUtils.toBean(pageResult, EducationPaperTask.class));
-
     }
     /**
      * 查询试卷任务列表（学生端）

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));
     }
 
     /**

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;
 
 }

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");

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);

exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperParamMapper.xml

@@ -15,11 +15,8 @@
         <result property="usb"    column="usb"    />
         <result property="saveGrades"    column="save_grades"    />
         <result property="driver"    column="driver"    />
-
         <result property="isTime"    column="is_time"    />
         <result property="examTime"    column="exam_time"    />
-
-
         <result property="directory"    column="directory"    />
         <result property="uploadTime"    column="upload_time"    />
         <result property="isDel"    column="is_del"    />
@@ -28,10 +25,16 @@
         <result property="isLook"    column="is_look"    />
         <result property="isConnect"    column="is_connect"    />
         <result property="isSession"    column="is_session"    />
+        <result property="warn"    column="warn"    />
+        <result property="isFile"    column="is_file"    />
+        <result property="isNet"    column="is_net"    />
+        <result property="isScreen"    column="is_screen"    />
+
+
     </resultMap>
 
     <sql id="selectEducationPaperParamVo">
-        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
     </sql>
 
     <select id="selectEducationPaperParamList" parameterType="EducationPaperParam" resultMap="EducationPaperParamResult">
@@ -81,7 +84,10 @@
             <if test="isLook != null">is_look,</if>
             <if test="isConnect != null">is_connect,</if>
             <if test="isSession != null">is_session,</if>
-
+            <if test="warn != null">warn,</if>
+            <if test="isFile != null">is_file,</if>
+            <if test="isNet != null">is_net,</if>
+            <if test="isScreen != null">is_screen,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paramId != null">#{paramId},</if>
@@ -98,14 +104,16 @@
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="isTime != null">#{isTime},</if>
             <if test="examTime != null">#{examTime},</if>
-
             <if test="isDel != null">#{isDel},</if>
             <if test="isRepeat != null">#{isRepeat},</if>
             <if test="isAnswer != null">#{isAnswer},</if>
             <if test="isLook != null">#{isLook},</if>
             <if test="isConnect != null">#{isConnect},</if>
             <if test="isSession != null">#{isSession},</if>
-
+            <if test="warn != null">#{warn},</if>
+            <if test="isFile != null">#{isFile},</if>
+            <if test="isNet != null">#{isNet},</if>
+            <if test="isScreen != null">#{isScreen},</if>
         </trim>
     </insert>
 
@@ -131,6 +139,10 @@
             <if test="isLook != null">is_look = #{isLook},</if>
             <if test="isConnect != null">is_connect = #{isConnect},</if>
             <if test="isSession != null">is_session = #{isSession},</if>
+            <if test="warn != null">warn = #{warn},</if>
+            <if test="isFile != null">is_file = #{isFile},</if>
+            <if test="isNet != null">is_net = #{isNet},</if>
+            <if test="isScreen != null">is_screen = #{isScreen},</if>
 
         </trim>
         where param_id = #{paramId}