diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2b3768d9..303b1c5d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
       <option name="name" value="huawei" />
       <option name="url" value="https://mirrors.huaweicloud.com/repository/maven/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-central" />
+      <option name="name" value="Maven Central Repository" />
+      <option name="url" value="https://repo1.maven.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/answerLogBrower.txt b/answerLogBrower.txt
new file mode 100644
index 00000000..01bc2585
--- /dev/null
+++ b/answerLogBrower.txt
@@ -0,0 +1,8 @@
+=== 学生提交内容（stu 目录） ===
+ -> 文件夹
+文件名1.html -> 大小: 397103B, 隐藏: false, 可读: true, 可写: true
+文件名2.html -> 大小: 397103B, 隐藏: false, 可读: true, 可写: true
+=== 学生提交内容得分点 ===
+考点文件名1.html -> 得分权值：1-> 是否得分：true
+考点文件名2.html -> 得分权值：1-> 是否得分：true
+考点百度一下，你就知道 -> 得分权值：1-> 是否得分：false
diff --git a/answerLogFile.txt b/answerLogFile.txt
new file mode 100644
index 00000000..996554f5
--- /dev/null
+++ b/answerLogFile.txt
@@ -0,0 +1,23 @@
+=== 学生提交内容（stu 目录） ===
+ -> 文件夹
+AHEWL -> 文件夹
+AHEWL\KMENS -> 文件夹
+AHEWL\MENS.EXE -> 大小: 17B, 隐藏: false, 可读: true, 可写: true
+BNPA -> 文件夹
+BNPA\RONGHE.COM -> 大小: 17B, 隐藏: false, 可读: true, 可写: true
+EDZK -> 文件夹
+EDZK\RONGHE.COM -> 大小: 17B, 隐藏: false, 可读: true, 可写: true
+HGACYL -> 文件夹
+HGACYL\PLAY.MEM -> 大小: 17B, 隐藏: false, 可读: true, 可写: true
+TING -> 文件夹
+TING\XYU -> 文件夹
+WUE -> 文件夹
+WUE\PB6.txt -> 大小: 17B, 隐藏: false, 可读: true, 可写: false
+XEPO -> 文件夹
+=== 学生提交内容得分点 ===
+HGACYL\RLQM.MEM -> 考察删除 -> 得分权值：1-> 是否得分：true
+TING\XYU\AUTOE.BAT -> 考察删除 -> 得分权值：1-> 是否得分：true
+AHEWL\KMENS -> 考察名称 -> 得分权值：1-> 是否得分：true
+EDZK\RONGHE.COM -> 考察名称 -> 得分权值：1-> 是否得分：true
+HGACYL\PLAY.MEM -> 考察名称 -> 得分权值：1-> 是否得分：true
+WUE\PB6.txt -> 考察名称 -> 得分权值：1-> 是否得分：true
diff --git a/answerLogMysql.txt b/answerLogMysql.txt
new file mode 100644
index 00000000..e1998dc6
--- /dev/null
+++ b/answerLogMysql.txt
@@ -0,0 +1,308 @@
+==================插入语句==================
+表名：t_team
+✅新增语句得分: 4
+==================更新语句==================
+✅修改语句得分: 3
+==================视图语句==================
+执行视图 v_education_aad91eecf6954d24a249f86bd2271b17 的查询结果：
+列名：
+themeName	
+description	
+teamName	
+earnedScore	
+未来实验室	
+关闭核反应堆	
+穿梭队	
+325	
+未来实验室	
+破解AI主机的密码	
+穿梭队	
+225	
+未来实验室	
+修复电力系统	
+穿梭队	
+165	
+古墓谜影	
+打开青铜棺椁的暗锁	
+探险队	
+325	
+古墓谜影	
+破解八卦阵机关	
+探险队	
+210	
+古墓谜影	
+寻找古墓入口的玉佩	
+探险队	
+110	
+民国悬案	
+解开保险箱的摩斯密码	
+侦探队	
+310	
+民国悬案	
+调查凶案现场的日记本	
+侦探队	
+225	
+执行视图 v_education_2_742b43462b1e45d797daa825ed1bb490 的查询结果：
+列名：
+themeName	
+description	
+teamName	
+earnedScore	
+未来实验室	
+关闭核反应堆	
+穿梭队	
+325	
+未来实验室	
+破解AI主机的密码	
+穿梭队	
+225	
+未来实验室	
+修复电力系统	
+穿梭队	
+165	
+古墓谜影	
+打开青铜棺椁的暗锁	
+探险队	
+325	
+古墓谜影	
+破解八卦阵机关	
+探险队	
+210	
+古墓谜影	
+寻找古墓入口的玉佩	
+探险队	
+110	
+民国悬案	
+解开保险箱的摩斯密码	
+侦探队	
+310	
+民国悬案	
+调查凶案现场的日记本	
+侦探队	
+225	
+
+是否结果等价: true
+✅等价视图语句得分为: 6
+==================删除语句==================
+提取出的表名: t_room
+提取出的条件: roomId = 5
+验证 SQL: SELECT COUNT(*) FROM t_room WHERE roomId = 5
+验证通过：符合 DELETE 条件的记录已删除。
+✅删除正确最终得分: 3
+==================查找语句==================
+执行考生答案的查询结果：
+列名：
+超时任务描述	
+实际得分	
+基础分	
+破解AI主机的密码	
+225	
+250	
+关闭核反应堆	
+325	
+350	
+指认真凶	
+0	
+400	
+执行正确答案的查询结果：
+列名：
+实际得分	
+超时任务描述	
+基础分	
+225	
+破解AI主机的密码	
+250	
+325	
+关闭核反应堆	
+350	
+0	
+指认真凶	
+400	
+
+是否结果等价: true
+✅当前查询SQL得分为：3
+执行考生答案的查询结果：
+列名：
+任务描述	
+队伍名称	
+指认真凶	
+侦探队	
+执行正确答案的查询结果：
+列名：
+任务描述	
+队伍名称	
+指认真凶	
+侦探队	
+
+是否结果等价: true
+✅当前查询SQL得分为：3
+==================触发器语句==================
+考生答案与标准答案语句内容一致（忽略格式）
+✅触发器得分点8
+==================储存过程==================
+测试语句：CALL pro_getMaxScore('古墓');
+测试语句：CALL pro_getMaxScore('古墓');
+执行 SQL 语句时发生错误: PROCEDURE pro_getMaxScore already exists
+==== 标准答案 ====
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+==== 考生答案 ====
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+两个结果集内容一致（不考虑顺序）！
+考生答案与标准答案语句结果为:true
+✅存储过程得分9
+==================插入语句==================
+表名：t_team
+✅新增语句得分: 4
+==================更新语句==================
+✅修改语句得分: 3
+==================视图语句==================
+执行视图 v_education_61a0be43eafd4ddeb267eab989db482d 的查询结果：
+列名：
+themeName	
+description	
+teamName	
+earnedScore	
+未来实验室	
+关闭核反应堆	
+穿梭队	
+325	
+未来实验室	
+破解AI主机的密码	
+穿梭队	
+225	
+未来实验室	
+修复电力系统	
+穿梭队	
+165	
+古墓谜影	
+打开青铜棺椁的暗锁	
+探险队	
+325	
+古墓谜影	
+破解八卦阵机关	
+探险队	
+210	
+古墓谜影	
+寻找古墓入口的玉佩	
+探险队	
+110	
+民国悬案	
+解开保险箱的摩斯密码	
+侦探队	
+310	
+民国悬案	
+调查凶案现场的日记本	
+侦探队	
+225	
+执行视图 v_education_2_13a7c1a8c1d540a4ab247934fbd5b46d 的查询结果：
+列名：
+themeName	
+description	
+teamName	
+earnedScore	
+未来实验室	
+关闭核反应堆	
+穿梭队	
+325	
+未来实验室	
+破解AI主机的密码	
+穿梭队	
+225	
+未来实验室	
+修复电力系统	
+穿梭队	
+165	
+古墓谜影	
+打开青铜棺椁的暗锁	
+探险队	
+325	
+古墓谜影	
+破解八卦阵机关	
+探险队	
+210	
+古墓谜影	
+寻找古墓入口的玉佩	
+探险队	
+110	
+民国悬案	
+解开保险箱的摩斯密码	
+侦探队	
+310	
+民国悬案	
+调查凶案现场的日记本	
+侦探队	
+225	
+
+是否结果等价: true
+✅等价视图语句得分为: 6
+==================删除语句==================
+提取出的表名: t_room
+提取出的条件: roomId = 5
+验证 SQL: SELECT COUNT(*) FROM t_room WHERE roomId = 5
+验证通过：符合 DELETE 条件的记录已删除。
+✅删除正确最终得分: 3
+==================查找语句==================
+执行考生答案的查询结果：
+列名：
+超时任务描述	
+实际得分	
+基础分	
+破解AI主机的密码	
+225	
+250	
+关闭核反应堆	
+325	
+350	
+指认真凶	
+0	
+400	
+执行正确答案的查询结果：
+列名：
+实际得分	
+超时任务描述	
+基础分	
+225	
+破解AI主机的密码	
+250	
+325	
+关闭核反应堆	
+350	
+0	
+指认真凶	
+400	
+
+是否结果等价: true
+✅当前查询SQL得分为：3
+执行考生答案的查询结果：
+列名：
+任务描述	
+队伍名称	
+指认真凶	
+侦探队	
+执行正确答案的查询结果：
+列名：
+任务描述	
+队伍名称	
+指认真凶	
+侦探队	
+
+是否结果等价: true
+✅当前查询SQL得分为：3
+==================触发器语句==================
+考生答案与标准答案语句内容一致（忽略格式）
+✅触发器得分点8
+==================储存过程==================
+测试语句：CALL pro_getMaxScore('古墓');
+测试语句：CALL pro_getMaxScore('古墓');
+执行 SQL 语句时发生错误: PROCEDURE pro_getMaxScore already exists
+==== 标准答案 ====
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+==== 考生答案 ====
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+{队伍名称=探险队, 房间名称=古墓谜影, 总用时=51, 总得分=645}
+两个结果集内容一致（不考虑顺序）！
+考生答案与标准答案语句结果为:true
+✅存储过程得分9
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/getpoints/GetPointsController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/getpoints/GetPointsController.java
new file mode 100644
index 00000000..2a1b3624
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/getpoints/GetPointsController.java
@@ -0,0 +1,33 @@
+package pc.exam.pp.module.exam.controller.admin.getpoints;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import pc.exam.pp.framework.common.pojo.CommonResult;
+import pc.exam.pp.module.exam.service.getpoints.ExamGetPointsService;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/exam/getopints")
+public class GetPointsController {
+
+    @Autowired
+    private ExamGetPointsService examGetPointsService;
+
+    /**
+     * 得出文件操作考点
+     * @return 得分
+     */
+    @PostMapping("/get_filePoint")
+    //todo 后期需要素材文件和答案文件的 父目录 如：D:/exam/3/shucai,D:/exam/3/win
+    public CommonResult get_file_point() throws IOException {
+        return CommonResult.success(examGetPointsService.get_file_point());
+    }
+    @PostMapping("/get_mysql_point")
+    //todo 后期需要素材文件和答案文件的 父目录 如：D:/exam/3/shucai,D:/exam/3/win
+    public CommonResult get_mysql_point() throws IOException {
+        return CommonResult.success(examGetPointsService.get_mysql_point());
+    }
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/MonitorController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/MonitorController.java
new file mode 100644
index 00000000..13355d26
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/MonitorController.java
@@ -0,0 +1,109 @@
+package pc.exam.pp.module.exam.controller.admin.monitor;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import pc.exam.pp.framework.common.pojo.PageParam;
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.framework.common.pojo.CommonResult;
+import pc.exam.pp.framework.common.util.object.BeanUtils;
+
+import static pc.exam.pp.framework.common.pojo.CommonResult.error;
+import static pc.exam.pp.framework.common.pojo.CommonResult.success;
+
+import pc.exam.pp.framework.excel.core.util.ExcelUtils;
+
+import pc.exam.pp.framework.apilog.core.annotation.ApiAccessLog;
+import static pc.exam.pp.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import pc.exam.pp.module.exam.controller.admin.monitor.vo.*;
+import pc.exam.pp.module.exam.dal.dataobject.monitor.MonitorDO;
+import pc.exam.pp.module.exam.service.monitor.MonitorService;
+
+
+@Tag(name = "管理后台 - 监控管理")
+@RestController
+@RequestMapping("/exam/monitor")
+@Validated
+public class MonitorController {
+@Resource
+private MonitorService monitorService;
+
+@PostMapping("/create")
+@Operation(summary = "创建监控管理")
+public CommonResult<String> createMonitor(@Valid @RequestBody MonitorSaveReqVO createReqVO) {
+    return success(monitorService.createMonitor(createReqVO));
+}
+
+@PutMapping("/update")
+@Operation(summary = "更新监控管理")
+public CommonResult<Boolean> updateMonitor(@Valid @RequestBody MonitorSaveReqVO updateReqVO) {
+    monitorService.updateMonitor(updateReqVO);
+    return success(true);
+}
+
+@DeleteMapping("/delete")
+@Operation(summary = "删除监控管理")
+@Parameter(name = "id", description = "编号", required = true)
+public CommonResult<Boolean> deleteMonitor(@RequestParam("id") String id) {
+    monitorService.deleteMonitor(id);
+    return success(true);
+}
+
+@GetMapping("/get")
+@Operation(summary = "获得监控管理")
+@Parameter(name = "id", description = "编号", required = true, example = "1024")
+public CommonResult<MonitorRespVO> getMonitor(@RequestParam("id") String id) {
+    MonitorDO monitor = monitorService.getMonitor(id);
+    return success(BeanUtils.toBean(monitor, MonitorRespVO.class));
+}
+
+@GetMapping("/page")
+@Operation(summary = "获得监控管理分页")
+public CommonResult<PageResult<MonitorRespVO>> getMonitorPage(@Valid MonitorPageReqVO pageReqVO) {
+    PageResult<MonitorDO> pageResult = monitorService.getMonitorPage(pageReqVO);
+    return success(BeanUtils.toBean(pageResult, MonitorRespVO.class));
+}
+
+@GetMapping("/export-excel")
+@Operation(summary = "导出监控管理 Excel")
+@ApiAccessLog(operateType = EXPORT)
+public void exportMonitorExcel(@Valid MonitorPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<MonitorDO> list = monitorService.getMonitorPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "监控管理.xls", "数据", MonitorRespVO.class,
+        BeanUtils.toBean(list, MonitorRespVO.class));
+}
+
+    @PostMapping("/stuMonitor")
+    @Operation(summary = "学生端进入考试返回值")
+    public CommonResult<String> getStuMonitor(@Valid @RequestBody StuMonitorPaperVo stuMonitorPaperVo) {
+        Boolean stuMonitor = monitorService.getStuMonitor(stuMonitorPaperVo);
+        if (stuMonitor)
+        {
+            return success("进入考试成功");
+        }
+        return error(100_200_300,"不在考试时间范围内！");
+
+    }
+    @PostMapping("/stuMonitorQu")
+    @Operation(summary = "学生端考试过程传试题")
+    public void updateStuMonitor(@Valid @RequestBody StuMonitorQuVo stuMonitorQuVo) {
+            monitorService.updateStuMonitor(stuMonitorQuVo);
+    }
+    @PostMapping("/endMonitor")
+    @Operation(summary = "学生端结束考试返回值")
+    public void endStuMonitor(@Valid @RequestBody StuMonitorPaperEndVo stuMonitorPaperEndVo) {
+        monitorService.endStuMonitor(stuMonitorPaperEndVo);
+    }
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorPageReqVO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorPageReqVO.java
new file mode 100644
index 00000000..00bed8a8
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorPageReqVO.java
@@ -0,0 +1,51 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import pc.exam.pp.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static pc.exam.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 监控管理分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MonitorPageReqVO extends PageParam {
+
+@Schema(description = "用户账号", example = "芋艿")
+private String username;
+
+@Schema(description = "用户姓名", example = "赵六")
+private String nickname;
+
+@Schema(description = "班级", example = "芋艿")
+private String className;
+
+@Schema(description = "考试状态", example = "2")
+private String examStatus;
+
+@Schema(description = "成绩")
+private String score;
+
+@Schema(description = "试卷编号")
+private String paperNum;
+
+@Schema(description = "场次", example = "赵六")
+private String taskName;
+
+@Schema(description = "机器ip")
+private String ip;
+
+@Schema(description = "剩余时间")
+@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+private LocalDateTime[] remainingTime;
+
+@Schema(description = "创建时间")
+@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorRespVO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorRespVO.java
new file mode 100644
index 00000000..8ddf894c
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorRespVO.java
@@ -0,0 +1,58 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 监控管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MonitorRespVO {
+
+@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19828")
+@ExcelProperty("主键id")
+private String monitorId;
+
+@Schema(description = "用户账号", example = "芋艿")
+@ExcelProperty("用户账号")
+private String username;
+
+@Schema(description = "用户姓名", example = "赵六")
+@ExcelProperty("用户姓名")
+private String nickname;
+
+@Schema(description = "班级", example = "芋艿")
+@ExcelProperty("班级")
+private String className;
+
+@Schema(description = "考试状态", example = "2")
+@ExcelProperty("考试状态")
+private String examStatus;
+
+@Schema(description = "成绩")
+@ExcelProperty("成绩")
+private String score;
+
+@Schema(description = "试卷编号")
+@ExcelProperty("试卷编号")
+private String paperNum;
+
+@Schema(description = "场次", example = "赵六")
+@ExcelProperty("场次")
+private String taskName;
+
+@Schema(description = "机器ip")
+@ExcelProperty("机器ip")
+private String ip;
+
+@Schema(description = "剩余时间")
+@ExcelProperty("剩余时间")
+private LocalDateTime remainingTime;
+
+@Schema(description = "创建时间")
+@ExcelProperty("创建时间")
+private LocalDateTime createTime;
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorSaveReqVO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorSaveReqVO.java
new file mode 100644
index 00000000..94174839
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/MonitorSaveReqVO.java
@@ -0,0 +1,43 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 监控管理新增/修改 Request VO")
+@Data
+public class MonitorSaveReqVO {
+
+@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19828")
+private String monitorId;
+
+@Schema(description = "用户账号", example = "芋艿")
+private String username;
+
+@Schema(description = "用户姓名", example = "赵六")
+private String nickname;
+
+@Schema(description = "班级", example = "芋艿")
+private String className;
+
+@Schema(description = "考试状态", example = "2")
+private String examStatus;
+
+@Schema(description = "成绩")
+private String score;
+
+@Schema(description = "试卷编号")
+private String paperNum;
+
+@Schema(description = "场次", example = "赵六")
+private String taskName;
+
+@Schema(description = "机器ip")
+private String ip;
+
+@Schema(description = "剩余时间")
+private LocalDateTime remainingTime;
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperEndVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperEndVo.java
new file mode 100644
index 00000000..3e03609f
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperEndVo.java
@@ -0,0 +1,14 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 监控管理 学生结束考试  Request VO")
+@Data
+public class StuMonitorPaperEndVo {
+    private String stuId;
+
+    private String score;
+    private String taskId;
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperVo.java
new file mode 100644
index 00000000..c7307f7a
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorPaperVo.java
@@ -0,0 +1,18 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 监控管理 学生进入考试  Request VO")
+@Data
+public class StuMonitorPaperVo {
+
+    private String stuId;
+
+    private String paperId;
+
+    private String ip;
+
+    private String taskId;
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorQuVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorQuVo.java
new file mode 100644
index 00000000..5bbc692f
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/monitor/vo/StuMonitorQuVo.java
@@ -0,0 +1,24 @@
+package pc.exam.pp.module.exam.controller.admin.monitor.vo;
+
+import jdk.dynalink.linker.LinkerServices;
+import lombok.Data;
+import pc.exam.pp.module.exam.dal.dataobject.EducationPaperScheme;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+@Data
+public class StuMonitorQuVo {
+    private String stuId;
+    private String paperId;
+    private String taskId;
+    private List<EducationPaperSchemeMap> paperSchemeMaps; // 使用自定义类
+
+    private String score;
+    @Data
+    public static class EducationPaperSchemeMap {
+        private EducationPaperScheme educationPaperScheme;
+        private Map<String, Boolean> questionResultMap;
+
+    }
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSessionController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSessionController.java
index bfe77ba4..1fe2f769 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSessionController.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperSessionController.java
@@ -5,9 +5,12 @@ import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import pc.exam.pp.framework.common.pojo.CommonResult;
+import pc.exam.pp.framework.common.pojo.PageResult;
 import pc.exam.pp.module.exam.controller.admin.paper.dto.SessionParamDto;
 import pc.exam.pp.module.exam.controller.admin.paper.dto.StatusDto;
+import pc.exam.pp.module.exam.controller.admin.paper.vo.EducationPaperSessionVo;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
+import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask;
 import pc.exam.pp.module.exam.service.paper.IEducationPaperSessionService;
 
 import java.util.Date;
@@ -32,9 +35,9 @@ public class EducationPaperSessionController
      * 查询试卷场次列表
      */
     @GetMapping("/list")
-    public CommonResult list(EducationPaperSession educationPaperSession)
+    public CommonResult<PageResult<EducationPaperSession>> list(EducationPaperSessionVo educationPaperSessionVo)
     {
-        List<EducationPaperSession> list = educationPaperSessionService.selectEducationPaperSessionList(educationPaperSession);
+        PageResult<EducationPaperSession> list = educationPaperSessionService.selectEducationPaperSessionList(educationPaperSessionVo);
         return CommonResult.success(list);
     }
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/vo/EducationPaperSessionVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/vo/EducationPaperSessionVo.java
new file mode 100644
index 00000000..f9772215
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/vo/EducationPaperSessionVo.java
@@ -0,0 +1,52 @@
+package pc.exam.pp.module.exam.controller.admin.paper.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import pc.exam.pp.framework.common.pojo.PageParam;
+
+import java.util.Date;
+@Schema(description = "试卷场次vo")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class EducationPaperSessionVo extends PageParam {
+    /** 主键ID */
+    private String sessionId;
+
+    /** 试卷任务ID */
+    // @Excel(name = "试卷任务ID")
+    private String taskId;
+
+    /** 批次 */
+    //  @Excel(name = "批次")
+    private String batch;
+
+    /** 考试开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    // @Excel(name = "考试开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 考试结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //@Excel(name = "考试结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /** 开始考试前分钟，允许入场 */
+    // @Excel(name = "开始考试前分钟，允许入场")
+    private String allowEntry;
+
+    /** 开始考试后分钟，禁止入场 */
+    //  @Excel(name = "开始考试后分钟，禁止入场")
+    private String endAllowEntry;
+
+    /** 开始考试后分钟，允许交卷 */
+    // @Excel(name = "开始考试后分钟，允许交卷")
+    private String allowSubmission;
+
+    /** 0启用1不启 */
+    // @Excel(name = "0启用1不启")
+    private String status;
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaper.java
index 3055486a..e92309c6 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaper.java
@@ -31,6 +31,7 @@ public class EducationPaper extends TenantBaseDO
    // @Excel(name = "试卷任务ID")
     private String taskId;
 
+    private String num;
     /** 使用次数 */
    // @Excel(name = "使用次数")
     private String counts;
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperScheme.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperScheme.java
index 7ec2e349..2a13f6ee 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperScheme.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperScheme.java
@@ -1,6 +1,7 @@
 package pc.exam.pp.module.exam.dal.dataobject;
 
 
+import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -32,6 +33,9 @@ public class EducationPaperScheme
    // @Excel(name = "方案ID")
     private String taskId;
 
+    //题型标题别名
+    private String quTitle;
+
     /** 题型 */
   //  @Excel(name = "题型")
     private String spName;
@@ -56,6 +60,8 @@ public class EducationPaperScheme
    // @Excel(name = "每题分数")
     private String quScores;
 
+    private String sort;
+
     @TableField(exist = false)
     private List<String> keyword;
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperSession.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperSession.java
index 13d1d284..2d3c677c 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperSession.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperSession.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.joda.time.DateTime;
 
 import java.util.Date;
 
@@ -34,12 +35,12 @@ public class EducationPaperSession
     private String batch;
 
     /** 考试开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
    // @Excel(name = "考试开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /** 考试结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
    //@Excel(name = "考试结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestion.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestion.java
index 7ffee621..ec7d144a 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestion.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestion.java
@@ -31,7 +31,7 @@ public class ExamQuestion extends TenantBaseDO {
 
     /** 题库id */
 //    @Excel(name = "题库id")
-    private String quBankId;
+   private String quBankId;
 
     /** 题库名称 */
 //    @Excel(name = "题库名称")
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionKeyword.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionKeyword.java
index 64661e1f..c73c7996 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionKeyword.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionKeyword.java
@@ -3,8 +3,10 @@ package pc.exam.pp.module.exam.dal.dataobject;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO;
 
@@ -18,6 +20,8 @@ import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO;
 @TableName(value = "exam_question_keyword", autoResultMap = true)
 @Data
 @Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
 public class ExamQuestionKeyword
 {
     private static final long serialVersionUID = 1L;
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/PaperListResponseVo.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/PaperListResponseVo.java
index d1f517dd..dcae7767 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/PaperListResponseVo.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/PaperListResponseVo.java
@@ -1,42 +1,16 @@
 package pc.exam.pp.module.exam.dal.dataobject;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class PaperListResponseVo {
-    private List<String> paperId; // 试卷列表
+    private Map<String, String> paperId; // 试卷ID和名称键值对
     private Set<String> selectedIds; // 已选试卷 ID 列表
-
-    public PaperListResponseVo() {
-    }
-
-    public PaperListResponseVo(List<String> paperId, Set<String> selectedIds) {
-        this.paperId = paperId;
-        this.selectedIds = selectedIds;
-    }
-
-    public List<String> getPaperId() {
-        return paperId;
-    }
-
-    public void setPaperId(List<String> paperId) {
-        this.paperId = paperId;
-    }
-
-    public Set<String> getSelectedIds() {
-        return selectedIds;
-    }
-
-    public void setSelectedIds(Set<String> selectedIds) {
-        this.selectedIds = selectedIds;
-    }
-
-
-    @Override
-    public String toString() {
-        return "PaperListResponseVo{" +
-                "paperId=" + paperId +
-                ", selectedIds=" + selectedIds +
-                '}';
-    }
 }
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/monitor/MonitorDO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/monitor/MonitorDO.java
new file mode 100644
index 00000000..fc7d75e0
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/monitor/MonitorDO.java
@@ -0,0 +1,67 @@
+package pc.exam.pp.module.exam.dal.dataobject.monitor;
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 监控管理 DO
+ *
+ * @author 管理员
+ */
+@TableName("exam_monitor")
+@KeySequence("exam_monitor_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MonitorDO extends BaseDO {
+
+/**
+ * 主键id
+ */
+@TableId(type = IdType.INPUT)
+private String monitorId;
+/**
+ * 用户账号
+ */
+private String username;
+/**
+ * 用户姓名
+ */
+private String nickname;
+/**
+ * 班级
+ */
+private String className;
+/**
+ * 考试状态
+ */
+private String examStatus;
+/**
+ * 成绩
+ */
+private String score;
+/**
+ * 试卷编号
+ */
+private String paperNum;
+/**
+ * 场次
+ */
+private String taskName;
+/**
+ * 机器ip
+ */
+private String ip;
+/**
+ * 剩余时间
+ */
+private Long  remainingTime;
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/monitor/MonitorMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/monitor/MonitorMapper.java
new file mode 100644
index 00000000..ec55c659
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/monitor/MonitorMapper.java
@@ -0,0 +1,34 @@
+package pc.exam.pp.module.exam.dal.mysql.monitor;
+
+
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
+import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX;
+import org.apache.ibatis.annotations.Mapper;
+import pc.exam.pp.module.exam.controller.admin.monitor.vo.MonitorPageReqVO;
+import pc.exam.pp.module.exam.dal.dataobject.monitor.MonitorDO;
+
+/**
+ * 监控管理 Mapper
+ *
+ * @author 管理员
+ */
+        @Mapper
+        public interface MonitorMapper extends BaseMapperX<MonitorDO> {
+
+        default PageResult<MonitorDO> selectPage(MonitorPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MonitorDO>()
+        .likeIfPresent(MonitorDO::getUsername, reqVO.getUsername())
+        .likeIfPresent(MonitorDO::getNickname, reqVO.getNickname())
+        .likeIfPresent(MonitorDO::getClassName, reqVO.getClassName())
+        .eqIfPresent(MonitorDO::getExamStatus, reqVO.getExamStatus())
+        .eqIfPresent(MonitorDO::getScore, reqVO.getScore())
+        .eqIfPresent(MonitorDO::getPaperNum, reqVO.getPaperNum())
+        .likeIfPresent(MonitorDO::getTaskName, reqVO.getTaskName())
+        .eqIfPresent(MonitorDO::getIp, reqVO.getIp())
+        .betweenIfPresent(MonitorDO::getRemainingTime, reqVO.getRemainingTime())
+        .betweenIfPresent(MonitorDO::getCreateTime, reqVO.getCreateTime())
+        .orderByDesc(MonitorDO::getCreateTime));
+        }
+
+        }
\ No newline at end of file
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperMapper.java
index 8a461649..33a9855f 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperMapper.java
@@ -105,7 +105,7 @@ public interface EducationPaperMapper extends BaseMapperX<EducationPaper>
 
     List<String> selectPaperByTaskIdAndRoll(@Param("taskId")String taskId);
 
-    List<String> getPaperByTaskIdByType(String taskId);
+    List<EducationPaper> getPaperByTaskIdByType(String taskId);
 
     String getSelectPaperIdBySchemeIds(String row);
 
@@ -117,5 +117,9 @@ public interface EducationPaperMapper extends BaseMapperX<EducationPaper>
 
     int changeStatus(@Param("paperId") String paperId
                     ,@Param("status") String status);
+
+    int selectCountPaperList();
+
+
 }
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperSessionMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperSessionMapper.java
index 8a3b9e88..917cd178 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperSessionMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperSessionMapper.java
@@ -4,7 +4,13 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX;
+import pc.exam.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
+import pc.exam.pp.module.exam.controller.admin.paper.vo.EducationPaperSessionVo;
+import pc.exam.pp.module.exam.controller.admin.paper.vo.PaperTaskPageVo;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
+import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask;
 
 /**
  * 试卷场次Mapper接口
@@ -13,7 +19,7 @@ import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
  * @date 2025-04-17
  */
 @Mapper
-public interface EducationPaperSessionMapper
+public interface EducationPaperSessionMapper extends BaseMapperX<EducationPaperSession>
 {
     /**
      * 查询试卷场次
@@ -29,7 +35,7 @@ public interface EducationPaperSessionMapper
      * @param educationPaperSession 试卷场次
      * @return 试卷场次集合
      */
-    public List<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSession educationPaperSession);
+
 
     /**
      * 新增试卷场次
@@ -70,4 +76,18 @@ public interface EducationPaperSessionMapper
 
     int changeStatus(@Param("sessionId") String sessionId
                     ,@Param("status") String status);
+
+    default PageResult<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSessionVo pageReqVO) {
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<EducationPaperSession>()
+                .likeIfPresent(EducationPaperSession::getStatus , pageReqVO.getStatus())
+                .likeIfPresent(EducationPaperSession::getBatch , pageReqVO.getBatch())
+                .likeIfPresent(EducationPaperSession::getEndAllowEntry , pageReqVO.getEndAllowEntry())
+                .likeIfPresent(EducationPaperSession::getTaskId , pageReqVO.getTaskId())
+                .likeIfPresent(EducationPaperSession::getAllowSubmission , pageReqVO.getAllowSubmission())
+                .likeIfPresent(EducationPaperSession::getAllowEntry , pageReqVO.getAllowEntry())
+
+
+        );
+    }
+
 }
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java
index fcfbc812..c7f87f2e 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/EducationPaperTaskMapper.java
@@ -105,4 +105,8 @@ public interface EducationPaperTaskMapper extends BaseMapperX<EducationPaperTask
 
     boolean changeStatus(@Param("taskId")String taskId,@Param("status") String status);
 
+    String selectEducationPaperTaskNameByid(String taskId);
+
+    String selectStuClassNameByClassId(Long classId);
+
 }
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/SysFileMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/SysFileMapper.java
index 7e04b15e..129ab7b3 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/SysFileMapper.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/SysFileMapper.java
@@ -69,4 +69,6 @@ public interface SysFileMapper
 
     public List<SysFileUpload>  selectSysFileByQuid(String quId);
 
+    List<SysFileUpload> selectSysFileByQuidIN(String quId);
+
 }
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsService.java
new file mode 100644
index 00000000..6a1f300c
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsService.java
@@ -0,0 +1,15 @@
+package pc.exam.pp.module.exam.service.getpoints;
+
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface ExamGetPointsService {
+
+
+
+    List<ExamQuestionAnswer> get_file_point() throws IOException;
+
+    List<ExamQuestionAnswer> get_mysql_point();
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsServiceImpl.java
new file mode 100644
index 00000000..2465682a
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/getpoints/ExamGetPointsServiceImpl.java
@@ -0,0 +1,62 @@
+package pc.exam.pp.module.exam.service.getpoints;
+
+import org.springframework.stereotype.Service;
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
+import pc.exam.pp.module.exam.utils.file.GetDifferencesBetweenFolders;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Service
+public class ExamGetPointsServiceImpl implements ExamGetPointsService{
+
+    static final String BASE_DIR = "D:/exam/3/";
+    @Override
+    public List<ExamQuestionAnswer> get_file_point() throws IOException {
+        List<ExamQuestionAnswer> answerList = new ArrayList<>();
+        AtomicInteger sortCounter = new AtomicInteger(1); // 计数器
+        String path1 = BASE_DIR + "shucai";
+        String path2 = BASE_DIR + "win";
+
+        // 获取 shucai 和 win 文件夹的差异
+        Map<String, String> differences = GetDifferencesBetweenFolders.getDifferencesBetweenFolders(path1, path2);
+
+        List<ExamQuestionAnswer> formattedDifferences = differences.entrySet().stream()
+                .map(entry -> {
+                    String key = entry.getKey();
+                    String value = entry.getValue();
+                    ExamQuestionAnswer answer = new ExamQuestionAnswer();
+                    answer.setContent(key); // 设置文件路径
+                    answer.setScoreRate("1");
+                    //这里设置answer的排序，按照循环次数来
+                    answer.setSort(String.valueOf(sortCounter.getAndIncrement())); // 按顺序设置排序值
+                    if (value.startsWith("仅存在于 "+path1)) {
+                        answer.setContentIn("考察删除");
+                    } else if (value.startsWith("仅存在于 "+path2)) {
+                        answer.setContentIn("考察名称");
+                    } else if (value.startsWith("属性不同")) {
+                        answer.setContentIn("考察属性");
+//                        answer.setContent(key + " -> " + value.split(" vs ")[1]); // 设置属性信息
+                    }
+                    return answer;
+                })
+                .sorted(Comparator.comparingInt(answer -> Integer.parseInt(answer.getSort()))) // 按 sort 排序
+                .collect(Collectors.toList());
+        answerList.addAll(formattedDifferences);
+
+        return answerList;
+    }
+
+    @Override
+    public List<ExamQuestionAnswer> get_mysql_point() {
+
+
+
+        return null;
+    }
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorService.java
new file mode 100644
index 00000000..0bd7048e
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorService.java
@@ -0,0 +1,59 @@
+package pc.exam.pp.module.exam.service.monitor;
+
+import jakarta.validation.*;
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.module.exam.controller.admin.monitor.vo.*;
+import pc.exam.pp.module.exam.dal.dataobject.monitor.MonitorDO;
+
+/**
+ * 监控管理 Service 接口
+ *
+ * @author 管理员
+ */
+        public interface MonitorService {
+
+        /**
+         * 创建监控管理
+         *
+         * @param createReqVO 创建信息
+         * @return 编号
+         */
+        String createMonitor(@Valid MonitorSaveReqVO createReqVO);
+
+        /**
+         * 更新监控管理
+         *
+         * @param updateReqVO 更新信息
+         */
+        void updateMonitor(@Valid MonitorSaveReqVO updateReqVO);
+
+        /**
+         * 删除监控管理
+         *
+         * @param id 编号
+         */
+        void deleteMonitor(String id);
+
+        /**
+         * 获得监控管理
+         *
+         * @param id 编号
+         * @return 监控管理
+         */
+        MonitorDO getMonitor(String id);
+
+        /**
+         * 获得监控管理分页
+         *
+         * @param pageReqVO 分页查询
+         * @return 监控管理分页
+         */
+        PageResult<MonitorDO> getMonitorPage(MonitorPageReqVO pageReqVO);
+
+        Boolean getStuMonitor(StuMonitorPaperVo stuMonitorPaperVo);
+
+        void updateStuMonitor(StuMonitorQuVo stuMonitorQuVo);
+
+        void endStuMonitor(StuMonitorPaperEndVo stuMonitorPaperEndVo);
+
+}
\ No newline at end of file
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java
new file mode 100644
index 00000000..ffa8c860
--- /dev/null
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java
@@ -0,0 +1,226 @@
+package pc.exam.pp.module.exam.service.monitor;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.alibaba.excel.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.framework.common.util.json.JsonUtils;
+import pc.exam.pp.framework.common.util.object.BeanUtils;
+
+import pc.exam.pp.module.exam.controller.admin.monitor.vo.*;
+import pc.exam.pp.module.exam.dal.dataobject.*;
+import pc.exam.pp.module.exam.dal.dataobject.monitor.MonitorDO;
+import pc.exam.pp.module.exam.dal.mysql.monitor.MonitorMapper;
+import pc.exam.pp.module.exam.dal.mysql.paper.*;
+import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionMapper;
+import pc.exam.pp.module.exam.utils.uuid.IdUtils;
+
+import static pc.exam.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static pc.exam.pp.module.system.enums.ErrorCodeConstants.MONITOR_NOT_EXISTS;
+
+/**
+ * 监控管理 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class MonitorServiceImpl implements MonitorService {
+        @Autowired
+        private RedisTemplate redisTemplate;
+        @Resource
+        private MonitorMapper monitorMapper;
+        @Resource
+        private StringRedisTemplate stringRedisTemplate;
+        @Resource
+        private ExamQuestionMapper examQuestionMapper;
+        @Resource
+        private EducationPaperMapper  educationPaperMapper;
+        @Resource
+        private EducationPaperPersonMapper educationPaperPersonMapper;
+        @Resource
+        private EducationPaperTaskMapper educationPaperTaskMapper;
+        @Resource
+        private EducationPaperParamMapper educationPaperParamMapper;
+        @Resource
+        private EducationPaperSessionMapper educationPaperSessionMapper;
+        @Override
+        public String createMonitor(MonitorSaveReqVO createReqVO) {
+        // 插入
+        MonitorDO monitor = BeanUtils.toBean(createReqVO, MonitorDO.class);
+        monitorMapper.insert(monitor);
+        // 返回
+        return monitor.getMonitorId();
+        }
+
+        @Override
+        public void updateMonitor(MonitorSaveReqVO updateReqVO) {
+        // 校验存在
+        validateMonitorExists(updateReqVO.getMonitorId());
+        // 更新
+        MonitorDO updateObj = BeanUtils.toBean(updateReqVO, MonitorDO.class);
+        monitorMapper.updateById(updateObj);
+        }
+
+        @Override
+        public void deleteMonitor(String id) {
+        // 校验存在
+        validateMonitorExists(id);
+        // 删除
+        monitorMapper.deleteById(id);
+        }
+
+        private void validateMonitorExists(String id) {
+        if (monitorMapper.selectById(id) == null) {
+        throw exception(MONITOR_NOT_EXISTS);
+        }
+        }
+
+        @Override
+        public MonitorDO getMonitor(String id) {
+        return monitorMapper.selectById(id);
+        }
+
+        @Override
+        public PageResult<MonitorDO> getMonitorPage(MonitorPageReqVO pageReqVO) {
+        return monitorMapper.selectPage(pageReqVO);
+        }
+        @Override
+        public Boolean getStuMonitor(StuMonitorPaperVo stuMonitorPaperVo) {
+                String key = "userCache:"+stuMonitorPaperVo.getTaskId()+":" + stuMonitorPaperVo.getStuId();
+                MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key),MonitorDO.class);
+                if (StringUtils.isNotBlank(stuMonitorPaperVo.getPaperId())){
+                        EducationPaper educationPaper = educationPaperMapper.selectEducationPaperByPaperId(stuMonitorPaperVo.getPaperId());
+                        info.setPaperNum(educationPaper.getNum());
+                }
+
+                info.setExamStatus("1");
+
+                info.setIp(stuMonitorPaperVo.getIp());
+
+                if (info.getRemainingTime()==null){
+                        stringRedisTemplate.opsForValue().set("userCache:"+stuMonitorPaperVo.getTaskId()+":"+stuMonitorPaperVo.getStuId(), JsonUtils.toJsonString(info));
+                        monitorMapper.insert(info);
+                        return true;
+                }else {
+                        EducationPaperPerson educationPaperPerson = educationPaperPersonMapper.selectByTaskIdAndPersonId(stuMonitorPaperVo.getTaskId(), stuMonitorPaperVo.getStuId());
+                        EducationPaperSession educationPaperSession = educationPaperSessionMapper.selectEducationPaperSessionBySessionId(educationPaperPerson.getSessionId());
+
+
+                        //结束时间
+                        Date endTime = educationPaperSession.getEndTime();
+                         //开始时间
+                        Date startTime = educationPaperSession.getStartTime();
+                        //开始考试前分钟，允许入场
+                        String allowEntry = educationPaperSession.getAllowEntry();
+                        //开始考试后分钟，禁止入场
+                        String endAllowEntry = educationPaperSession.getEndAllowEntry();
+
+                        LocalDateTime now = LocalDateTime.now();
+                        LocalDateTime start = DateUtil.toLocalDateTime(startTime);
+                        LocalDateTime end = DateUtil.toLocalDateTime(endTime);
+
+                        // 考试开始前允许入场时间（分钟）
+                        int allowEntryMin = Integer.parseInt(allowEntry);
+
+                        // 考试开始后允许入场时间（分钟）
+                        int endAllowEntryMin = Integer.parseInt(endAllowEntry);
+
+                        // 入场允许范围： [start , end + endAllowEntryMin]
+                        LocalDateTime entryEnd = end.plusMinutes(endAllowEntryMin);
+
+                        boolean isWithinEntryTime = now.isAfter(start) && now.isBefore(entryEnd);
+                        System.out.println("是否在允许入场时间段内：" + isWithinEntryTime);
+
+                        if (isWithinEntryTime){
+                                long remainingSeconds = ChronoUnit.SECONDS.between(LocalDateTime.now(),
+                                        DateUtil.toLocalDateTime(endTime));
+                                info.setRemainingTime(remainingSeconds > 0 ? remainingSeconds : 0);
+                                stringRedisTemplate.opsForValue().set("userCache:"+stuMonitorPaperVo.getTaskId()+":"+stuMonitorPaperVo.getStuId(), JsonUtils.toJsonString(info), remainingSeconds, TimeUnit.SECONDS);
+                                monitorMapper.updateById(info);
+                                return true;
+                        }else {
+                                return false;
+                        }
+                }
+
+        }
+
+        @Override
+        public void updateStuMonitor(StuMonitorQuVo stuMonitorQuVo) {
+                String key = "userCache:"+stuMonitorQuVo.getTaskId()+":" + stuMonitorQuVo.getStuId();
+                MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key),MonitorDO.class);
+                if (info != null) {
+                        AtomicInteger totalScore = new AtomicInteger();  // 用于累加总分
+                        // 记录答题结果
+                        List<StuMonitorQuVo.EducationPaperSchemeMap> paperSchemeMaps = stuMonitorQuVo.getPaperSchemeMaps();
+                        for (StuMonitorQuVo.EducationPaperSchemeMap paperSchemeMap : paperSchemeMaps) {
+                                EducationPaperScheme educationPaperScheme = paperSchemeMap.getEducationPaperScheme();
+                                Map<String, Boolean> questionResultMap = paperSchemeMap.getQuestionResultMap();
+                                questionResultMap.forEach((quId, value) -> {
+                                        if (value) {
+                                                System.out.println("QuestionId: " + quId + ", boolean: " + value);
+                                                String quScores = educationPaperScheme.getQuScores();
+                                                int score = Integer.parseInt(quScores);  // 转换为 int 类型的分数
+                                                totalScore.addAndGet(score);  // 累加到总分
+
+                                        }
+                                });
+                        }
+
+                        // 更新成绩（这里假设一题10分）
+
+                        info.setScore(String.valueOf(totalScore));
+
+                        // 更新缓存
+                        redisTemplate.opsForValue().set(key, info);
+//                        monitorMapper.updateById(info);
+                }
+
+        }
+
+        @Override
+        public void endStuMonitor(StuMonitorPaperEndVo stuMonitorPaperEndVo) {
+                String key = "userCache:" + stuMonitorPaperEndVo.getTaskId()+":" +stuMonitorPaperEndVo.getStuId();
+                MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key),MonitorDO.class);
+                EducationPaperParam educationPaperParam = educationPaperParamMapper.selectEducationPaperParamByTaskId(stuMonitorPaperEndVo.getTaskId());
+                EducationPaperTask educationPaperTask = educationPaperTaskMapper.selectEducationPaperTaskByTaskId(stuMonitorPaperEndVo.getTaskId());
+               if ("1".equals(educationPaperParam.getSaveGrades())){
+                       info.setScore(stuMonitorPaperEndVo.getScore());
+                }else {
+                       MonitorDO monitorDO = monitorMapper.selectById(info.getMonitorId());
+                       if (Integer.parseInt(monitorDO.getScore())  <Integer.parseInt(stuMonitorPaperEndVo.getScore())){
+                               info.setScore(stuMonitorPaperEndVo.getScore());
+                       }
+
+               }
+               //练习下的任务 结束改为 代考
+                if ("0".equals(educationPaperTask.getStatus())){
+                        info.setExamStatus("0");
+                }else {
+                        info.setExamStatus("2");
+                        redisTemplate.delete(key);
+                }
+
+                monitorMapper.updateById(info);
+
+        }
+
+}
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperPersonServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperPersonServiceImpl.java
index ea208bfc..5606db40 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperPersonServiceImpl.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperPersonServiceImpl.java
@@ -1,25 +1,40 @@
 package pc.exam.pp.module.exam.service.paper;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
 
 
 import com.alibaba.excel.util.StringUtils;
 import jakarta.annotation.Resource;
 import org.apache.poi.hssf.record.DVALRecord;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.framework.common.util.json.JsonUtils;
 import pc.exam.pp.module.exam.controller.admin.paper.dto.PersonRepDto;
 import pc.exam.pp.module.exam.controller.admin.paper.vo.DeleteRequestVo;
 import pc.exam.pp.module.exam.controller.admin.paper.vo.SessionStuPageReqVO;
 import pc.exam.pp.module.exam.controller.admin.paper.vo.StudentSessionReqVO;
 import pc.exam.pp.module.exam.controller.admin.student.vo.StudentPageReqVO;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperPerson;
+import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
+import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask;
+import pc.exam.pp.module.exam.dal.dataobject.monitor.MonitorDO;
 import pc.exam.pp.module.exam.dal.dataobject.student.StudentDO;
+import pc.exam.pp.module.exam.dal.mysql.monitor.MonitorMapper;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperPersonMapper;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperSessionMapper;
+import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperTaskMapper;
 import pc.exam.pp.module.exam.dal.mysql.student.StudentMapper;
+import pc.exam.pp.module.exam.utils.uuid.IdUtils;
 import pc.exam.pp.module.system.api.user.dto.AdminUserRespDTO;
 
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,10 +48,16 @@ public class EducationPaperPersonServiceImpl implements IEducationPaperPersonSer
 {
     @Autowired
     private EducationPaperPersonMapper educationPaperPersonMapper;
-
-
+    @Autowired
+    private EducationPaperTaskMapper  educationPaperTaskMapper;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
     @Autowired
     private EducationPaperSessionMapper educationPaperSessionMapper;
+    @Resource
+    private MonitorMapper monitorMapper;
+    @Autowired
+    private RedisTemplate redisTemplate;
     /**
      * 查询试卷人员分配
      *
@@ -147,8 +168,58 @@ public class EducationPaperPersonServiceImpl implements IEducationPaperPersonSer
                     existing.setSessionId(sessionId);
                     existing.setBatch(batch);
                     educationPaperPersonMapper.updateByTaskIdAndStuId(existing);
+                    //todo 本来没有设置考场的，这里要更新缓存的 剩余时间
+                    EducationPaperSession educationPaperSession = educationPaperSessionMapper.selectEducationPaperSessionBySessionId(sessionId);
+                    String key = "userCache:" + taskId+":"+studentId;
+                    MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key),MonitorDO.class);
+                    if (info!=null){
+                        Date startTime = educationPaperSession.getStartTime();
+                        Date endTime = educationPaperSession.getEndTime();
+
+                        LocalDateTime start = Instant.ofEpochMilli(startTime.getTime())
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+
+                        LocalDateTime end = Instant.ofEpochMilli(endTime.getTime())
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+
+                        long remainingSeconds = ChronoUnit.SECONDS.between(start, end);
+
+                        info.setRemainingTime(remainingSeconds);
+
+
+                    }
+                    // 更新缓存
+                    redisTemplate.opsForValue().set(key, info);
+                    monitorMapper.updateById(info);
+
+
                 } else if (existing == null) {
+
+
+                    String name= educationPaperTaskMapper.selectEducationPaperTaskNameByid(taskId);
+
                     EducationPaperPerson educationPaperPerson=new EducationPaperPerson();
+                    String key = "userCache:" + taskId+":"+studentId;
+                    PersonRepDto personRepDto =  educationPaperPersonMapper.selectUserById(studentId);
+                    String uuid = IdUtils.simpleUUID();
+                    MonitorDO info = new MonitorDO();
+                    info.setMonitorId(uuid);
+                    info.setUsername(personRepDto.getUsername());
+                    info.setNickname(personRepDto.getNickname());
+                    //设置学生班级
+                    if (StringUtils.isNotBlank(personRepDto.getClassId().toString())){
+                        String className=educationPaperTaskMapper.selectStuClassNameByClassId(personRepDto.getClassId());
+                        info.setClassName(className);
+                    }
+                    info.setExamStatus("0");
+                    info.setScore("0");
+                    info.setPaperNum("");
+                    info.setTaskName(name);
+                    stringRedisTemplate.opsForValue().set(key, JsonUtils.toJsonString(info));
+                    monitorMapper.insert(info);
+
                     educationPaperPerson.setPersonId(studentId);
                     educationPaperPerson.setSessionId(sessionId);
                     educationPaperPerson.setBatch(batch);
@@ -172,11 +243,21 @@ public class EducationPaperPersonServiceImpl implements IEducationPaperPersonSer
 
     @Override
     public int removeSessionStu(StudentSessionReqVO reqVO) {
+        List<String> studentIds = reqVO.getStudentIds();
+        for (String studentId : studentIds) {
+            String key = "userCache:" + reqVO.getTaskId()+":"+studentId;
+            redisTemplate.delete(key);
+        }
         return educationPaperPersonMapper.removeSessionStu(reqVO);
     }
 
     @Override
     public int removeTaskStu(DeleteRequestVo deleteRequestVo) {
+        List<String> studentIds = deleteRequestVo.getStudentIds();
+        for (String studentId : studentIds) {
+            String key = "userCache:" + deleteRequestVo.getTaskId()+":"+studentId;
+            redisTemplate.delete(key);
+        }
         return educationPaperPersonMapper.removeTaskStu(deleteRequestVo);
     }
 
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperQuServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperQuServiceImpl.java
index d37eb563..bdefe62c 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperQuServiceImpl.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperQuServiceImpl.java
@@ -6,10 +6,12 @@ import pc.exam.pp.module.exam.controller.admin.paper.vo.ExamPaperVo;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperQu;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperScheme;
 import pc.exam.pp.module.exam.dal.dataobject.ExamQuestion;
+import pc.exam.pp.module.exam.dal.dataobject.SysFileUpload;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperMapper;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperQuMapper;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperSchemeMapper;
 import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionMapper;
+import pc.exam.pp.module.exam.dal.mysql.question.SysFileMapper;
 
 import java.util.List;
 
@@ -30,6 +32,8 @@ public class EducationPaperQuServiceImpl implements IEducationPaperQuService
     private ExamQuestionMapper examQuestionMapper;
     @Autowired
     private EducationPaperSchemeMapper educationPaperSchemeMapper;
+    @Autowired
+    private SysFileMapper sysFileMapper;
     /**
      * 查询试卷试题
      *
@@ -108,6 +112,14 @@ public class EducationPaperQuServiceImpl implements IEducationPaperQuService
        List<String> quIds =educationPaperQuMapper.selectPaperQuByPaperId(paperId);
        List<ExamQuestion> examQuestionList=examQuestionMapper.selectExamQuestionListByQuIds(quIds);
 
+       if (examQuestionList!=null&&examQuestionList.size()>0){
+           for (ExamQuestion examQuestion : examQuestionList) {
+               //查找原始和素材试题文件
+               List<SysFileUpload> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
+               examQuestion.setFileUploads(sysFileUploads);
+           }
+
+       }
        String taskid=educationPaperMapper.selectTaskIdByPaperId(paperId);
 
       List<EducationPaperScheme> educationPaperSchemeList=  educationPaperSchemeMapper.selectEducationPaperTaskByTaskId(taskid);
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java
index 2874d380..937a4eea 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java
@@ -148,11 +148,19 @@ public class EducationPaperServiceImpl implements IEducationPaperService
                 examQuestionIds.addAll(quId);
 
             }
+             int number=educationPaperMapper.selectCountPaperList();
+
+            // 格式化为8位，不足前面补0
+            String formattedNumber = String.format("%08d", number);
+
+
+
             //构建试卷
             EducationPaper educationPaper =new EducationPaper();
             String uuid = IdUtils.simpleUUID();
             educationPaper.setPaperId(uuid);
             educationPaper.setTaskId(taskid);
+            educationPaper.setNum(formattedNumber);
             educationPaper.setTenantId(TenantContextHolder.getRequiredTenantId());
             educationPaperMapper.insertEducationPaper(educationPaper);
 
@@ -213,8 +221,15 @@ public class EducationPaperServiceImpl implements IEducationPaperService
         //构建返回对象
         PaperListResponseVo paperListResponseVo=new PaperListResponseVo();
         //查找该方案所有的试卷
-        List<String> paperByTaskIdByType = educationPaperMapper.getPaperByTaskIdByType(taskId);
-        paperListResponseVo.setPaperId(paperByTaskIdByType);
+        List<EducationPaper> paperByTaskIdByType = educationPaperMapper.getPaperByTaskIdByType(taskId);
+        Map<String, String> paperMap = new HashMap<>();
+        if (paperByTaskIdByType!=null&&paperByTaskIdByType.size()>0){
+            for (EducationPaper educationPaper : paperByTaskIdByType) {
+                paperMap.put(educationPaper.getPaperId(),educationPaper.getNum());
+            }
+
+        }
+        paperListResponseVo.setPaperId(paperMap);
         //
         Set<String> selectedIds =new HashSet<>();
         //根据选中的方案，查找选中方案下已分配的试卷
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperSessionServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperSessionServiceImpl.java
index f0f027ff..5733ecc6 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperSessionServiceImpl.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperSessionServiceImpl.java
@@ -2,6 +2,8 @@ package pc.exam.pp.module.exam.service.paper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.module.exam.controller.admin.paper.vo.EducationPaperSessionVo;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperPersonMapper;
 import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperSessionMapper;
@@ -41,7 +43,7 @@ public class EducationPaperSessionServiceImpl implements IEducationPaperSessionS
      * @return 试卷场次
      */
     @Override
-    public List<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSession educationPaperSession)
+    public PageResult<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSessionVo educationPaperSession)
     {
         return educationPaperSessionMapper.selectEducationPaperSessionList(educationPaperSession);
     }
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperSessionService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperSessionService.java
index b9fec8ba..2266a8c5 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperSessionService.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperSessionService.java
@@ -1,6 +1,8 @@
 package pc.exam.pp.module.exam.service.paper;
 
 
+import pc.exam.pp.framework.common.pojo.PageResult;
+import pc.exam.pp.module.exam.controller.admin.paper.vo.EducationPaperSessionVo;
 import pc.exam.pp.module.exam.dal.dataobject.EducationPaperSession;
 
 import java.util.List;
@@ -27,7 +29,7 @@ public interface IEducationPaperSessionService
      * @param educationPaperSession 试卷场次
      * @return 试卷场次集合
      */
-    public List<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSession educationPaperSession);
+   PageResult<EducationPaperSession> selectEducationPaperSessionList(EducationPaperSessionVo educationPaperSession);
 
     /**
      * 新增试卷场次
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/file/GetDifferencesBetweenFolders.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/utils/file/GetDifferencesBetweenFolders.java
similarity index 98%
rename from exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/file/GetDifferencesBetweenFolders.java
rename to exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/utils/file/GetDifferencesBetweenFolders.java
index fd354ae8..d2014b9c 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/file/GetDifferencesBetweenFolders.java
+++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/utils/file/GetDifferencesBetweenFolders.java
@@ -1,4 +1,4 @@
-package pc.exam.pp.module.judgement.controller.utils.file;
+package pc.exam.pp.module.exam.utils.file;
 
 
 import java.io.IOException;
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperMapper.xml
index 087e48dc..fd845370 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="EducationPaper" id="EducationPaperResult">
         <result property="paperId"    column="paper_id"    />
         <result property="taskId"    column="task_id"    />
+        <result property="num"    column="num"    />
         <result property="counts"    column="counts"    />
         <result property="rollUp"    column="roll_up"    />
         <result property="isAb"    column="is_ab"    />
@@ -47,7 +48,7 @@
 
 
     <sql id="selectEducationPaperVo">
-        select paper_id, task_id, counts, roll_up, is_ab, status ,create_time,update_time,creator,updater ,deleted from education_paper
+        select paper_id, task_id, num,counts, roll_up, is_ab, status ,create_time,update_time,creator,updater ,deleted from education_paper
     </sql>
 
 
@@ -103,8 +104,8 @@ select  task_id from education_paper where paper_id=#{paperId}
     <select id="selectPaperByTaskIdAndRoll" resultType="java.lang.String">
         select paper_id from education_paper where task_id=#{taskId} and deleted ='0'
     </select>
-    <select id="getPaperByTaskIdByType" resultType="java.lang.String">
-        select paper_id from education_paper where task_id=#{taskId} and status ='0' and deleted ='0' and roll_up  IS NOT NULL
+    <select id="getPaperByTaskIdByType" resultMap="EducationPaperResult">
+        select * from education_paper where task_id=#{taskId} and status ='0' and deleted ='0' and roll_up  IS NOT NULL
 
     </select>
     <select id="getSelectPaperIdBySchemeIds" resultType="java.lang.String">
@@ -115,6 +116,9 @@ select  task_id from education_paper where paper_id=#{paperId}
         <include refid="selectEducationPaperVo"/>
         where task_id =#{taskId} and deleted ='0'
     </select>
+    <select id="selectCountPaperList" resultType="java.lang.Integer">
+        select  count(*) from   education_paper
+     </select>
 
 
     <insert id="insertEducationPaper" parameterType="EducationPaper">
@@ -122,6 +126,7 @@ select  task_id from education_paper where paper_id=#{paperId}
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paperId != null">paper_id,</if>
             <if test="taskId != null">task_id,</if>
+            <if test="num != null">num,</if>
             <if test="counts != null">counts,</if>
             <if test="rollUp != null">roll_up,</if>
             <if test="isAb != null">is_ab,</if>
@@ -136,6 +141,7 @@ select  task_id from education_paper where paper_id=#{paperId}
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paperId != null">#{paperId},</if>
             <if test="taskId != null">#{taskId},</if>
+            <if test="num != null">#{num},</if>
             <if test="counts != null">#{counts},</if>
             <if test="rollUp != null">#{rollUp},</if>
             <if test="isAb != null">#{isAb},</if>
@@ -149,10 +155,10 @@ select  task_id from education_paper where paper_id=#{paperId}
         </trim>
     </insert>
     <insert id="insertEducationPaperList">
-        INSERT INTO education_paper (paper_id, task_id, counts, roll_up, is_ab, status ) VALUES
+        INSERT INTO education_paper (paper_id, task_id,num ,counts, roll_up, is_ab, status ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-            #{item.paperId}, #{item.taskId}, #{item.counts}, #{item.rollUp}, #{item.isAb}, #{item.status}
+            #{item.paperId}, #{item.taskId}, #{item.num},#{item.counts}, #{item.rollUp}, #{item.isAb}, #{item.status}
             )
         </foreach>
     </insert>
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSchemeMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSchemeMapper.xml
index d0c05663..f6cbe32a 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSchemeMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSchemeMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="EducationPaperScheme" id="EducationPaperSchemeResult">
         <result property="schemeId"    column="scheme_id"    />
         <result property="taskId"    column="task_id"    />
+        <result property="quTitle"    column="qu_title"    />
         <result property="spName"    column="sp_name"    />
         <result property="quLevel"    column="qu_level"    />
         <result property="keywords"    column="keywords"    />
@@ -14,10 +15,11 @@
         <result property="quNumbers"    column="qu_numbers"    />
         <result property="quScores"    column="qu_scores"    />
         <result property="subtotalScore"    column="subtotal_score"    />
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <sql id="selectEducationPaperSchemeVo">
-        select scheme_id, task_id, sp_name, qu_level, keywords, point_names, qu_numbers, qu_scores, subtotal_score from education_paper_scheme
+        select scheme_id, task_id,qu_title,sp_name, qu_level, keywords, point_names, qu_numbers, qu_scores, subtotal_score,sort from education_paper_scheme
     </sql>
 
     <select id="selectEducationPaperSchemeList" parameterType="EducationPaperScheme" resultMap="EducationPaperSchemeResult">
@@ -32,6 +34,7 @@
             <if test="quScores != null  and quScores != ''"> and qu_scores = #{quScores}</if>
             <if test="subtotalScore != null  and subtotalScore != ''"> and subtotal_score = #{subtotalScore}</if>
         </where>
+        order by  sort asc
     </select>
 
     <select id="selectEducationPaperSchemeBySchemeId" parameterType="String" resultMap="EducationPaperSchemeResult">
@@ -47,6 +50,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="schemeId != null">scheme_id,</if>
             <if test="taskId != null">task_id,</if>
+            <if test="quTitle != null">qu_title,</if>
             <if test="spName != null">sp_name,</if>
             <if test="quLevel != null">qu_level,</if>
             <if test="keywords != null">keywords,</if>
@@ -54,10 +58,12 @@
             <if test="quNumbers != null">qu_numbers,</if>
             <if test="quScores != null">qu_scores,</if>
             <if test="subtotalScore != null">subtotal_score,</if>
+            <if test="sort != null">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="schemeId != null">#{schemeId},</if>
             <if test="taskId != null">#{taskId},</if>
+            <if test="quTitle != null">#{quTitle},</if>
             <if test="spName != null">#{spName},</if>
             <if test="quLevel != null">#{quLevel},</if>
             <if test="keywords != null">#{keywords},</if>
@@ -65,13 +71,14 @@
             <if test="quNumbers != null">#{quNumbers},</if>
             <if test="quScores != null">#{quScores},</if>
             <if test="subtotalScore != null">#{subtotalScore},</if>
+            <if test="sort != null">#{sort},</if>
         </trim>
     </insert>
     <insert id="insertEducationPaperSchemeList">
-        INSERT INTO education_paper_scheme (scheme_id, task_id, sp_name, qu_level, keywords, point_names, qu_numbers, qu_scores, subtotal_score) VALUES
+        INSERT INTO education_paper_scheme (scheme_id, task_id, qu_title,sp_name, qu_level, keywords, point_names, qu_numbers, qu_scores, subtotal_score,sort) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-            #{item.schemeId}, #{item.taskId}, #{item.spName}, #{item.quLevel}, #{item.keywords}, #{item.pointNames}, #{item.quNumbers}, #{item.quScores}, #{item.subtotalScore}
+            #{item.schemeId}, #{item.taskId}, #{item.quTitle},#{item.spName}, #{item.quLevel}, #{item.keywords}, #{item.pointNames}, #{item.quNumbers}, #{item.quScores}, #{item.subtotalScore}, #{item.sort}
             )
         </foreach>
     </insert>
@@ -80,6 +87,7 @@
         update education_paper_scheme
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskId != null">task_id = #{taskId},</if>
+            <if test="quTitle != null">qu_title = #{quTitle},</if>
             <if test="spName != null">sp_name = #{spName},</if>
             <if test="quLevel != null">qu_level = #{quLevel},</if>
             <if test="keywords != null">keywords = #{keywords},</if>
@@ -87,6 +95,7 @@
             <if test="quNumbers != null">qu_numbers = #{quNumbers},</if>
             <if test="quScores != null">qu_scores = #{quScores},</if>
             <if test="subtotalScore != null">subtotal_score = #{subtotalScore},</if>
+            <if test="subtotalScore != null">sort = #{sort},</if>
         </trim>
         where scheme_id = #{schemeId}
     </update>
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSessionMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSessionMapper.xml
index 3073137d..ffd1bbac 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSessionMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperSessionMapper.xml
@@ -21,20 +21,7 @@
         select session_id, task_id, batch, start_time, end_time, allow_entry, end_allow_entry, allow_submission, status, paper_id from education_paper_session
     </sql>
 
-    <select id="selectEducationPaperSessionList" parameterType="EducationPaperSession" resultMap="EducationPaperSessionResult">
-        <include refid="selectEducationPaperSessionVo"/>
-        <where>
-            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="batch != null  and batch != ''"> and batch  LIKE CONCAT('%', #{batch}, '%')</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="allowEntry != null  and allowEntry != ''"> and allow_entry = #{allowEntry}</if>
-            <if test="endAllowEntry != null  and endAllowEntry != ''"> and end_allow_entry = #{endAllowEntry}</if>
-            <if test="allowSubmission != null  and allowSubmission != ''"> and allow_submission = #{allowSubmission}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="paperId != null  and paperId != ''"> and paper_id = #{paperId}</if>
-        </where>
-    </select>
+
 
     <select id="selectEducationPaperSessionBySessionId" parameterType="String" resultMap="EducationPaperSessionResult">
         <include refid="selectEducationPaperSessionVo"/>
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
index e4a1472f..7a2566a9 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/EducationPaperTaskMapper.xml
@@ -107,6 +107,12 @@
             )
         </if>
     </select>
+    <select id="selectEducationPaperTaskNameByid" resultType="java.lang.String">
+        select  task_name from education_paper_task where  task_id=#{taskId}
+    </select>
+    <select id="selectStuClassNameByClassId" resultType="java.lang.String">
+        select name from exam_class where  id=#{classId}
+    </select>
 
 
     <insert id="insertEducationPaperTask" parameterType="EducationPaperTask">
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
index d6419b40..749b91e7 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionMapper.xml
@@ -89,8 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content,</if>
             <if test="contentText != null">content_text,</if>
             <if test="analysis != null">analysis,</if>
-            <if test="deptId != null">dept_id,</if>
-            <if test="userId != null">user_id,</if>
             <if test="pointNames != null">point_names,</if>
             <if test="keywords != null">keywords,</if>
             <if test="manual != null">manual,</if>
@@ -115,8 +113,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">#{content},</if>
             <if test="contentText != null">#{contentText},</if>
             <if test="analysis != null">#{analysis},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="userId != null">#{userId},</if>
             <if test="pointNames != null">#{pointNames},</if>
             <if test="keywords != null">#{keywords},</if>
             <if test="manual != null">#{manual},</if>
diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/SysFileMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/SysFileMapper.xml
index 62e9029b..7e89841a 100644
--- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/SysFileMapper.xml
+++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/SysFileMapper.xml
@@ -33,6 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quId != null "> and qu_id = #{quId}</if>
         </where>
     </select>
+    <select id="selectSysFileByQuidIN" resultMap="SysFileResult">
+        <include refid="selectSysFileVo"/>
+        <where>
+            <if test="quId != null "> and qu_id = #{quId}</if>
+        </where>
+        and (file_type = '0' or file_type ='1')
+    </select>
 
     <insert id="insertSysFile" parameterType="SysFileUpload">
         insert into sys_file
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/Mysql/MysqlController.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/Mysql/MysqlController.java
index 39add505..d48f7ffb 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/Mysql/MysqlController.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/Mysql/MysqlController.java
@@ -7,6 +7,9 @@ import org.springframework.web.bind.annotation.RestController;
 import pc.exam.pp.framework.common.pojo.CommonResult;
 import pc.exam.pp.module.judgement.controller.service.mysql.IMysqlServerice;
 
+import java.io.IOException;
+import java.sql.SQLException;
+
 @RestController
 @RequestMapping("/tool/Mysql")
 public class MysqlController {
@@ -16,12 +19,14 @@ public class MysqlController {
     @Autowired
     private IMysqlServerice mysqlServerice;
 
+
+
     /**
      * Mysql判分
      * @return 得分
      */
     @PostMapping("/run_judgement")
-    public CommonResult run_C_code() {
+    public CommonResult run_C_code() throws SQLException, IOException {
         return CommonResult.success(mysqlServerice.Judgement());
     }
 
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/WindowFile/WindowsFileController.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/WindowFile/WindowsFileController.java
index f700a551..23eb03e6 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/WindowFile/WindowsFileController.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/admin/WindowFile/WindowsFileController.java
@@ -20,22 +20,14 @@ public class WindowsFileController {
 
     @Autowired
     private IFileServerice fileServerice;
-    /**
-     * 得出文件操作考点
-     * @return 得分
-     */
-//    @PostMapping("/get_filePoint")
-   //todo 后期需要素材文件和答案文件的 父目录 如：D:/exam/3/shucai,D:/exam/3/win
-   public CommonResult get_file_point() throws IOException {
-       return CommonResult.success(fileServerice.get_file_point());
-    }
+
 
 
     /**
      * 文件操作题判分
      * @return 判分
      */
-    @PostMapping("/run_file")
+    @PostMapping("/run_judgement")
     public CommonResult run_file_point() throws IOException {
         //"权值得分比重"
         return CommonResult.success(fileServerice.run_file_point());
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
index e5a8291d..0693be70 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/browser/BrowserServericeImpl.java
@@ -4,8 +4,10 @@ import org.springframework.stereotype.Service;
 import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
 import pc.exam.pp.module.judgement.controller.utils.brower.BookmarkChecker;
 import pc.exam.pp.module.judgement.controller.utils.brower.BookmarkDeleter;
-import pc.exam.pp.module.judgement.controller.utils.file.GetDifferencesBetweenFolders;
+import pc.exam.pp.module.exam.utils.file.GetDifferencesBetweenFolders;
 
+import java.io.BufferedWriter;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -14,6 +16,7 @@ import java.util.Map;
 
 @Service
 public class BrowserServericeImpl implements IBrowserServerice {
+    static String answerLogPath = "answerLogBrower.txt"; // 文件路径
     //考生试题文件夹
     static final String BASE_DIR = "D:/exam/4/";
     //谷歌浏览器
@@ -51,6 +54,12 @@ public class BrowserServericeImpl implements IBrowserServerice {
         //根据路径，得到考生答题文件集合
         Map<String, String> stuFiles = GetDifferencesBetweenFolders.listFilesAndFoldersWithAttributes(Paths.get(BASE_DIR));
 
+
+        // 输出学生提交的内容
+        appendToFile(answerLogPath,"=== 学生提交内容（stu 目录） ===");
+
+        stuFiles.forEach((key, value) ->  appendToFile(answerLogPath,key + " -> " + value));
+        appendToFile(answerLogPath,"=== 学生提交内容得分点 ===");
         // 对比学生提交内容与试题得分点
         //这里指挥判断存在文件夹的得分点
         Integer studentScore = compareStuAndTestFiles(answerList, stuFiles);
@@ -96,13 +105,29 @@ public class BrowserServericeImpl implements IBrowserServerice {
             // 如果正确，则累加总分
             if (isCorrect) {
                 totalScore += currentScore;
-                System.out.println(answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
+
+                appendToFile(answerLogPath,"考点"+answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
             }else {
-                System.out.println(answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
+
+                appendToFile(answerLogPath,"考点"+answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
 
             }
         }
         //返回累加的得分点
         return totalScore;
     }
+    /**
+     * 将指定内容追加写入到指定文件中。
+     *
+     * @param filePath 文件路径
+     * @param content  要写入的内容
+     */
+    public static void appendToFile(String filePath, String content) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath, true))) {
+            writer.write(content);
+            writer.newLine(); // 可选：添加换行符
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/FileServericeImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/FileServericeImpl.java
index a0c3fa85..30138e58 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/FileServericeImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/FileServericeImpl.java
@@ -2,8 +2,10 @@ package pc.exam.pp.module.judgement.controller.service.file;
 
 import org.springframework.stereotype.Service;
 import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
-import pc.exam.pp.module.judgement.controller.utils.file.GetDifferencesBetweenFolders;
+import pc.exam.pp.module.exam.utils.file.GetDifferencesBetweenFolders;
 
+import java.io.BufferedWriter;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -17,41 +19,7 @@ import java.util.stream.Collectors;
 @Service
 public class FileServericeImpl implements IFileServerice {
     static final String BASE_DIR = "D:/exam/3/";
-    @Override
-    public List<ExamQuestionAnswer> get_file_point() throws IOException {
-        List<ExamQuestionAnswer> answerList = new ArrayList<>();
-        AtomicInteger sortCounter = new AtomicInteger(1); // 计数器
-        String path1 = BASE_DIR + "shucai";
-        String path2 = BASE_DIR + "win";
-
-        // 获取 shucai 和 win 文件夹的差异
-        Map<String, String> differences = GetDifferencesBetweenFolders.getDifferencesBetweenFolders(path1, path2);
-
-        List<ExamQuestionAnswer> formattedDifferences = differences.entrySet().stream()
-                .map(entry -> {
-                    String key = entry.getKey();
-                    String value = entry.getValue();
-                    ExamQuestionAnswer answer = new ExamQuestionAnswer();
-                    answer.setContent(key); // 设置文件路径
-                    answer.setScoreRate("1");
-                    //这里设置answer的排序，按照循环次数来
-                    answer.setSort(String.valueOf(sortCounter.getAndIncrement())); // 按顺序设置排序值
-                    if (value.startsWith("仅存在于 "+path1)) {
-                        answer.setContentIn("考察删除");
-                    } else if (value.startsWith("仅存在于 "+path2)) {
-                        answer.setContentIn("考察名称");
-                    } else if (value.startsWith("属性不同")) {
-                        answer.setContentIn("考察属性");
-//                        answer.setContent(key + " -> " + value.split(" vs ")[1]); // 设置属性信息
-                    }
-                    return answer;
-                })
-                .sorted(Comparator.comparingInt(answer -> Integer.parseInt(answer.getSort()))) // 按 sort 排序
-                .collect(Collectors.toList());
-        answerList.addAll(formattedDifferences);
-
-        return answerList;
-    }
+    static String answerLogPath = "answerLogFile.txt"; // 文件路径
 
     @Override
     public String run_file_point() throws IOException {
@@ -68,9 +36,12 @@ public class FileServericeImpl implements IFileServerice {
         Map<String, String> stuFiles = GetDifferencesBetweenFolders.listFilesAndFoldersWithAttributes(Paths.get( stuPath));
 
         // 输出学生提交的内容
-        System.out.println("\n=== 学生提交内容（stu 目录） ===");
-        stuFiles.forEach((key, value) -> System.out.println(key + " -> " + value));
-        System.out.println("\n=== 学生提交内容得分点 ===");
+        appendToFile(answerLogPath,"=== 学生提交内容（stu 目录） ===");
+
+        stuFiles.forEach((key, value) ->  appendToFile(answerLogPath,key + " -> " + value));
+
+
+        appendToFile(answerLogPath,"=== 学生提交内容得分点 ===");
         // 对比学生提交内容与试题得分点
         Integer studentScore = compareStuAndTestFiles(answerList, stuFiles);
 
@@ -113,14 +84,28 @@ public class FileServericeImpl implements IFileServerice {
             // 如果正确，则累加总分
             if (isCorrect) {
                 totalScore += currentScore;
-                System.out.println(answer.getContent() + " -> " + answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
+                appendToFile(answerLogPath,answer.getContent() + " -> " + answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
             }else {
-                System.out.println(answer.getContent() + " -> " + answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
-
+                appendToFile(answerLogPath,answer.getContent() + " -> " + answer.getContentIn() + " -> 得分权值：" + answer.getScoreRate()+"-> 是否得分："+isCorrect);
             }
         }
 
         //返回累加的总分
       return totalScore;
     }
+
+    /**
+     * 将指定内容追加写入到指定文件中。
+     *
+     * @param filePath 文件路径
+     * @param content  要写入的内容
+     */
+    public static void appendToFile(String filePath, String content) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath, true))) {
+            writer.write(content);
+            writer.newLine(); // 可选：添加换行符
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/IFileServerice.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/IFileServerice.java
index 89068a13..004c9ab5 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/IFileServerice.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/file/IFileServerice.java
@@ -9,7 +9,7 @@ import java.util.List;
 public interface IFileServerice {
 
 
-    List<ExamQuestionAnswer> get_file_point() throws IOException;
+
 
     String run_file_point() throws IOException;
 
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/IMysqlServerice.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/IMysqlServerice.java
index 868d380e..acc06f51 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/IMysqlServerice.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/IMysqlServerice.java
@@ -1,8 +1,18 @@
 package pc.exam.pp.module.judgement.controller.service.mysql;
 
 
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public interface IMysqlServerice {
-    int Judgement();
+    AtomicInteger Judgement() throws IOException, SQLException;
+
+
+
 
 
 }
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
index 17808542..47cff8ce 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/service/mysql/MysqlServericeImpl.java
@@ -1,42 +1,53 @@
 package pc.exam.pp.module.judgement.controller.service.mysql;
 
 import org.springframework.stereotype.Service;
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionAnswer;
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionKeyword;
 import pc.exam.pp.module.judgement.controller.utils.Mysql.MySQLExporterUtil;
 import pc.exam.pp.module.judgement.controller.utils.Mysql.SQLComparatorUtil;
 import pc.exam.pp.module.judgement.controller.utils.Mysql.SqlFileProcessor;
+import pc.exam.pp.module.judgement.domain.SqlExecutionResult;
 
 import java.awt.*;
 import java.io.*;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.*;
 import java.util.*;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
 public class MysqlServericeImpl implements IMysqlServerice {
-    List<String> backupFiles;
-    String databaseName;
+    static List<String> backupFiles;
+    static String databaseName;
+    static String answerLogPath = "answerLogMysql.txt"; // 文件路径
     @Override
-    public int Judgement() {
+    public AtomicInteger Judgement() throws IOException, SQLException {
+
+
+        AtomicInteger totalScoreAnswer= new AtomicInteger();
         backupFiles = new ArrayList<>(); // 用于存储生成的备份文件路径
         //todo
         //根据考生考试的试卷id，来获取答案文件路径、 原始 数据库SQL 文件路径
         // 文件路径
-        String filePath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_002_114\\结果素材\\结果素材\\Teacher\\答案.txt";  // 答案文件路径
+        String filePath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\结果素材\\结果素材\\Teacher\\answer.txt";  // 答案文件路径
 
-        String answerPath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_002_114\\考试素材\\考试素材\\Student\\db\\db_hrm.sql"; // 原始 SQL 文件路径
+        String answerPath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\考试素材\\考试素材\\Student\\db\\db_escape.myd"; // 原始 SQL 文件路径
 
         // 生成随机数据库名，临时使用
         databaseName = "db_" + UUID.randomUUID().toString().replace("-", "").substring(0, 6);
 
+
         // 连接到 MySQL 默认数据库
         String url = "jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=Asia/Shanghai";
         String user = "root";
         String password = "123";
-        int similarityRatio = 0;
         try {
             // **连接到 MySQL 默认数据库，创建新的数据库**
             try (Connection conn = DriverManager.getConnection(url, user, password);
@@ -46,235 +57,1518 @@ public class MysqlServericeImpl implements IMysqlServerice {
                 System.out.println("已创建数据库：" + databaseName);
             }
 
-            // **建立连接到新创建的数据库**
-            String newDbUrl = "jdbc:mysql://localhost:3306/" + databaseName + "?useSSL=false&serverTimezone=Asia/Shanghai";
 
-            // 解析 SQL 文件
-            Map<String, List<String>> sqlMap = SqlFileProcessor.processSqlFile(filePath);
-            //把select语句和其他语句分开
-            List<String> selectStatements = sqlMap.getOrDefault("SELECT", new ArrayList<>());
-            List<String> otherStatements = sqlMap.getOrDefault("OTHER", new ArrayList<>());
-
-            // **通过命令行执行 SQL 文件**
-            boolean sqlFileExecuted = executeSqlFileUsingCommandLine(answerPath, databaseName, user, password);
-
-
-            // 执行完 SQL 后，进行数据库导出
-            MySQLExporterUtil exporter = new MySQLExporterUtil(databaseName, user, password, "backup_0");
-            exporter.export();
-
-
-            // 如果 SQL 文件执行成功，执行其他 SQL 语句
-            if (sqlFileExecuted) {
-                executeOtherSqlStatements(otherStatements, newDbUrl, user, password);
-            }
-            //todo 后面改成试题数据库，这里是完整正确答案数据库
-            //执行完所有的sql语句后，把结果数据库导出来
-            MySQLExporterUtil exporterDataBase = new MySQLExporterUtil(databaseName, user, password, databaseName);
-            exporterDataBase.export();
-            // 导出的结果数据库文件路径
-            String exportedDatabaseFilePath = "./" + databaseName + ".sql";
-            //String exportedDatabaseFilePath = "C:\\Users\\20373\\Desktop\\exam-master\\exam-api\\"+"db_bfd3b5bc"+".sql";
-
-            // 计算与第一个文件的比较结果
-            similarityRatio = compareBackupFiles(exportedDatabaseFilePath, backupFiles);
-
-//            // 输出匹配比例
-            System.out.println("匹配比例个数: " + similarityRatio);
-
-            //删除临时创建的数据库databaseName
-            try (Connection conn = DriverManager.getConnection(newDbUrl, user, password);
-                 Statement stmt = conn.createStatement()) {
-                String dropDbSql = "DROP DATABASE " + databaseName;
-                stmt.executeUpdate(dropDbSql);
-                System.out.println("已删除数据库：" + databaseName);
-            }
-            //比较select语句正确个数
-            //后期直接根据考生文件路径和试卷答案路径，来比对select文件
-            String filepath1 = "C:\\Users\\20373\\Desktop\\1.txt";
-            String filepath2 = "C:\\Users\\20373\\Desktop\\2.txt";
-
-            boolean isEquivalent = SQLComparatorUtil.compareSQLResults(filepath1, filepath2);
-            if (isEquivalent) {
-                ++similarityRatio;
-            }
-
-
-        } catch (IOException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
-        return similarityRatio;
-    }
 
-        /**
-         * 通过命令行执行 SQL 文件
-         */
-        private static boolean executeSqlFileUsingCommandLine(String filePath, String databaseName, String user, String password) throws IOException {
-            // 构建 MySQL 命令
-            String command = String.format("mysql -u %s -p%s %s < %s", user, password, databaseName, filePath);
+        // **建立连接到新创建的数据库**
+        String newDbUrl = "jdbc:mysql://localhost:3306/" + databaseName + "?useSSL=false&serverTimezone=Asia/Shanghai";
 
-            // 使用 ProcessBuilder 执行命令
-            ProcessBuilder processBuilder = new ProcessBuilder("cmd.exe", "/c", command);
-            processBuilder.inheritIO();  // 将输入输出重定向到当前控制台
-            Process process = processBuilder.start();
+        // 解析 SQL 文件
+        Map<String, List<String>> sqlMap = SqlFileProcessor.processSqlFile(filePath);
+        //select语句(文件对比)
+        List<String> selectStatements = sqlMap.getOrDefault("SELECT", new ArrayList<>());
+        //触发器 (文件对比)
+        List<String> triggerStatements = sqlMap.getOrDefault("TRIGGER", new ArrayList<>());
+        //存储过程 (文件对比)
+        List<String> procedureStatements = sqlMap.getOrDefault("PROCEDURE", new ArrayList<>());
+        //视图
+        List<String> viewStatements = sqlMap.getOrDefault("VIEW", new ArrayList<>());
+        //删除语句
+        List<String> delStatements = sqlMap.getOrDefault("DELETE", new ArrayList<>());
+        //其他（建表，新增，修改。结果对比）
+        List<String> otherStatements = sqlMap.getOrDefault("OTHER", new ArrayList<>());
+        // **通过命令行执行 SQL 文件**
+        boolean sqlFileExecuted = executeSqlFileUsingCommandLine(answerPath, databaseName, user, password);
 
-            try {
-                // 等待命令执行完成
-                int exitCode = process.waitFor();
-                if (exitCode == 0) {
-                    System.out.println("SQL 文件执行成功：" + filePath);
-                    return true;  // 返回 true 表示执行成功
-                } else {
-                    System.err.println("SQL 文件执行失败：" + filePath);
-                    return false;  // 返回 false 表示执行失败
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-                return false;
-            }
+        // 执行完 SQL 后，进行数据库导出
+        MySQLExporterUtil exporter = new MySQLExporterUtil(databaseName, user, password, "0");
+        exporter.export();
+
+
+        List<SqlExecutionResult> sqlExecutionResults = new ArrayList<>();
+        // 如果 SQL 文件执行成功，执行其他 SQL 语句
+        if (sqlFileExecuted) {
+            sqlExecutionResults = executeOtherSqlStatements(otherStatements, newDbUrl, user, password);
         }
 
-        /**
-         * 执行其他 SQL 语句
-         */
-        private  void executeOtherSqlStatements(List<String> otherStatements, String dbUrl, String user, String password) throws SQLException {
-            int fileName = 1;  // 初始化 fileName
-            String outputPath = "./"; // 备份文件存放路径
+        //执行完所有的sql语句后，把结果数据库导出来
+        MySQLExporterUtil exporterDataBase = new MySQLExporterUtil("mys_010_122", user, password, databaseName);
+        exporterDataBase.export();
+        // 导出的结果数据库文件路径
+        String exportedDatabaseFilePath = "./"+databaseName+".sql";
 
-            backupFiles.add(outputPath+ "backup_" + 0 + ".sql");
-            try (Connection conn = DriverManager.getConnection(dbUrl, user, password);
-                 Statement stmt = conn.createStatement()) {
+        // 计算与第一个文件的比较结果
+        List<SqlExecutionResult> sqlExecutionResults1 = compareBackupFiles(exportedDatabaseFilePath, sqlExecutionResults);
+//        System.out.println("====================================更新后的");
+//        sqlExecutionResults1.forEach(System.out::println);
+        //找出所有isvalied为false的，获得对象的sqlStatement，
+        List<SqlExecutionResult> invalidResults = sqlExecutionResults1.stream()
+                .filter(result -> !result.isValid())
+                .collect(Collectors.toList());
 
-                for (String sql : otherStatements) {
-                    String trimmedSql = sql.trim();
-                    if (!trimmedSql.isEmpty() && !trimmedSql.startsWith("--")) {  // 忽略空行和注释
-                        try {
-                            stmt.executeUpdate(trimmedSql);  // 执行 SQL 语句
-                            System.out.println("成功执行 SQL: " + trimmedSql);
+        for (SqlExecutionResult invalidResult : invalidResults) {
+            String sqlStatement = invalidResult.getSqlStatement();
+            //更新语句
+            if (sqlStatement.trim().toUpperCase().startsWith("UPDATE")) {
 
-                            // 执行完 SQL 后，进行数据库导出
-                            String backupFile = outputPath + "backup_" + fileName + ".sql";
-                            MySQLExporterUtil exporter = new MySQLExporterUtil(databaseName, user, password, "backup_" + fileName);
-                            exporter.export();
+                appendToFile(answerLogPath,"==================更新语句==================");
+                // 提取表名
+                Pattern pattern = Pattern.compile("(?i)^UPDATE\\s+([`\\w]+)");
+                Matcher matcher = pattern.matcher(sqlStatement);
 
-                            // 将备份文件路径添加到备份文件列表中
-                            backupFiles.add(backupFile);
-                            fileName++;  // 每执行一次 SQL 语句，fileName 递增
+                if (matcher.find()) {
+                    String tableName = matcher.group(1).replace("`", ""); // 获取表名
+
+                    // 从两个 SQL 文件中解析该表的数据
+                    List<Map<String, String>> baseData = parseInsertStatements("0.sql", tableName);
+                    List<Map<String, String>> newData = parseInsertStatements(databaseName+".sql", tableName);
+
+                    // 找到主键字段
+                    String primaryKey = getPrimaryKeyFromSqlFile("0.sql", tableName);
+
+                    // 遍历新文件中的记录，检查是否有变化
+                    for (Map<String, String> newRecord : newData) {
+                        Map<String, String> oldRecord = null;
+
+                        for (Map<String, String> baseRecord : baseData) {
+                            if (primaryKey != null && baseRecord.get(primaryKey).equals(newRecord.get(primaryKey))) {
+                                oldRecord = baseRecord;
+                                break;
+                            }
+                        }
+
+                        if (oldRecord != null && !oldRecord.equals(newRecord)) {
+                            // 数据变化，生成 UPDATE 语句
+                            List<String> updateSqls = generateUpdateSql(oldRecord, newRecord, tableName);
+
+                            List<ExamQuestionKeyword> examQuestionKeywords = new ArrayList<>();
+                            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "UPDATE", "1"));
+                            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "t_mission", "1"));
+                            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "5", "1"));
+                            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "set", "1"));
+
+                            int totalScoreRate = calculateTotalScoreRate(updateSqls, examQuestionKeywords);
+                            appendToFile(answerLogPath,"✅修改语句得分: " + totalScoreRate);
+                            totalScoreAnswer.addAndGet(totalScoreRate);
+                        }
+                    }
+
+
+                }
+            }
+            //插入语句
+            if (sqlStatement.trim().toUpperCase().startsWith("INSERT")) {
+                appendToFile(answerLogPath,"==================插入语句==================");
+                // 正则表达式匹配表名
+                Pattern pattern = Pattern.compile("INSERT INTO\\s+`?(\\w+)`?\\s*\\(");
+                Matcher matcher = pattern.matcher(sqlStatement);
+
+                if (matcher.find()) {
+                    String tableName = matcher.group(1).replace("`", ""); // 获取表名
+                    appendToFile(answerLogPath,"表名："+tableName);
+
+                    //获取表明后
+                    // 从两个 SQL 文件中解析该表的数据
+                    List<Map<String, String>> baseData = parseInsertStatements("0.sql", tableName);
+                    List<Map<String, String>> newData = parseInsertStatements(databaseName+".sql", tableName);
+                    // 根据表名，找出关于此表的 insert 差异语句
+                    List<String> insertDifferences = findInsertDifferences(baseData, newData);
+                    List<ExamQuestionKeyword> examQuestionKeywords=new ArrayList<>();
+                    examQuestionKeywords.add(new ExamQuestionKeyword("","","INSERT","1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("","","INTO","1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("","","探险队","1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("","","穿梭队","1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("","","侦探队","1"));
+                    // 计算总的 scoreRate
+                    int totalScoreRate = calculateTotalScoreRate(insertDifferences, examQuestionKeywords);
+
+                    appendToFile(answerLogPath,"✅新增语句得分: " + totalScoreRate);
+                    totalScoreAnswer.addAndGet(totalScoreRate);
+                }
+            }
+
+
+            //建表
+            if (sqlStatement.trim().toUpperCase().startsWith("CREATE TABLE")){
+
+                appendToFile(answerLogPath,"==================建表语句==================");
+                // 正则表达式匹配表名
+                Pattern pattern = Pattern.compile("CREATE TABLE\\s+`?(\\w+)`?\\s*\\(");
+                Matcher matcher = pattern.matcher(sqlStatement);
+
+                if (matcher.find()) {
+                    String tableName = matcher.group(1).replace("`", ""); // 获取表名
+                    appendToFile(answerLogPath,"表名："+tableName);
+
+                    // 模拟解析 SQL 文件
+                    Map<String, String> baseData = parseSqlFile("0.sql");
+                    Map<String, String>  newData = parseSqlFile(databaseName + ".sql");
+
+                    // 查找 CREATE TABLE 语句
+                    List<String> createStatements = findCreateTableStatements(baseData, newData, tableName);
+
+                    List<ExamQuestionKeyword> examQuestionKeywords = new ArrayList<>();
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "CREATE TABLE", "1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "t_team", "1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "teamId", "1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "PRIMARY KEY", "1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "teamName", "1"));
+                    examQuestionKeywords.add(new ExamQuestionKeyword("", "", "VARCHAR(50)", "1"));
+
+                    // 输出结果
+
+                    //  调用方法，计算得分
+                    int totalScoreRate = calculateTotalScoreRate(createStatements,examQuestionKeywords);
+
+                    appendToFile(answerLogPath,"✅建表语句得分: " + totalScoreRate);
+                    totalScoreAnswer.addAndGet(totalScoreRate);
+                }
+            }
+
+        }
+        // 输出匹配比例
+//        invalidResults.forEach(System.out::println);
+        //视图
+        if (viewStatements!=null&&viewStatements.size()>0){
+//            System.out.println("=========================答案视图语句");
+//            System.out.println(viewStatements);
+            //解析考生的视图
+            List<String> viewAnswerStatements =getAnswerView(exportedDatabaseFilePath);
+//            System.out.println("=========================考生视图语句");
+//            System.out.println(viewAnswerStatements);
+
+            //存储 视图语句的正确性
+            List<String> trueViewsql=new ArrayList<>();
+            List<String> falseViewsql=new ArrayList<>();
+            for (String viewAnswerStatement : viewAnswerStatements) {
+                appendToFile(answerLogPath,"==================视图语句==================");
+                String sqlviewStuAnswer = removeComments(viewAnswerStatement);
+
+
+                boolean matched = false; // 标志是否找到等价的视图
+                for (String viewStatement : viewStatements) {
+                    String sqlviewAnswer = removeComments(viewStatement);
+
+                    // 比较两个视图的结果
+                    // 正则表达式，用于匹配 "VIEW" 后面的视图名称
+                    String regex = "(?<=VIEW\\s)([\\w`_]+)";
+
+                    // 从第一个 SQL 语句中提取视图名称
+                    String viewNam1 = extractViewName(sqlviewAnswer, regex);
+                    // 从第二个 SQL 语句中提取视图名称
+                    String viewNam2 = extractViewName(sqlviewStuAnswer, regex);
+                    if (viewNam1.equals(viewNam2)){
+
+                        // 随机生成视图名称
+                        String viewName1 = "v_education_" + UUID.randomUUID().toString().replace("-", "");
+                        String viewName2 = "v_education_2_" + UUID.randomUUID().toString().replace("-", "");
+
+                        // 替换 SQL 语句中的视图名称
+                        String createView1 = sqlviewAnswer.replace(viewNam1, viewName1);
+                        String createView2 = sqlviewStuAnswer.replace(viewNam2, viewName2);
+
+
+                        try (Connection conn = DriverManager.getConnection(newDbUrl, user, password);
+                             Statement stmt = conn.createStatement()) {
+
+                            // 执行 CREATE VIEW 语句，创建视图
+                            stmt.execute(createView1);
+
+                            stmt.execute(createView2);
+
+                            // 执行查询，获取视图1的结果
+                            appendToFile(answerLogPath,"执行视图 " + viewName1 + " 的查询结果：");
+
+
+                            String sql1 = "SELECT * FROM " + viewName1;
+                            List<List<String>> result1 = executeQuery(stmt, sql1);
+                            printResult(result1);
+
+                            // 执行查询，获取视图2的结果
+                            appendToFile(answerLogPath,"执行视图 " + viewName2 + " 的查询结果：");
+                            String sql2 = "SELECT * FROM " + viewName2;
+                            List<List<String>> result2 = executeQuery(stmt, sql2);
+                            printResult(result2);
+
+                            // 比较两个视图的结果
+                            boolean isEquivalent = compareResults(result1, result2);
+                            appendToFile(answerLogPath,"\n是否结果等价: " + isEquivalent);
+                            // 删除视图
+                            System.out.println("\n删除视图 " + viewName1 + " 和 " + viewName2 + "...");
+                            stmt.execute("DROP VIEW IF EXISTS " + viewName1);
+                            stmt.execute("DROP VIEW IF EXISTS " + viewName2);
+                            if (isEquivalent) {
+                                trueViewsql.add(sqlviewStuAnswer);
+                                matched = true;
+                                break; // 找到等价视图就跳出内层循环
+                            }
                         } catch (SQLException e) {
-                            System.err.println("执行 SQL 失败: " + trimmedSql);
                             e.printStackTrace();
                         }
                     }
                 }
-
-                // 所有 SQL 执行完后，反向顺序进行备份文件比较
-                for (int i = backupFiles.size() -1; i > 0; i--) {
-                    String currentBackupFile = backupFiles.get(i);
-                    String previousBackupFile = backupFiles.get(i - 1);
-                    filterBackupFile(previousBackupFile, currentBackupFile);  // 过滤并保留差异部分
+                // 如果没有找到等价视图
+                if (!matched) {
+                    falseViewsql.add(sqlviewStuAnswer);
                 }
-
             }
-            System.out.println("所有 SQL 语句执行完成");
-        }
 
 
-        /**
-         * 过滤 `backup_X.sql`，只保留与 `backup_0.sql` 不同的 SQL 语句（按 `;` 进行断句）
-         */
-        public static void filterBackupFile(String baseFile, String newFile) {
-            try {
-                Set<String> baseSqlSet = readSqlStatements(baseFile);
-                List<String> newSqlList = readSqlStatements(newFile).stream()
-                        .filter(sql -> !baseSqlSet.contains(sql)) // 只保留 `backup_0.sql` 中没有的 SQL
-                        .collect(Collectors.toList());
+            List<ExamQuestionKeyword> examQuestionKeywords = new ArrayList<>();
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "CREATE", "1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "VIEW", "1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "v_score", "1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "`t_room`.`themeName` AS `themeName`", "1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "`t_mission`.`description` AS `description`", "1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("", "", "`t_team`.`teamName` AS `teamName`", "1"));
+            //拿出正确的语句
+            int totalScore = 0;
 
-                // 重新写入 `backup_X.sql`，仅包含不同的 SQL 语句
-                try (BufferedWriter writer = new BufferedWriter(new FileWriter(newFile))) {
-                    for (String sql : newSqlList) {
-                        writer.write(sql + ";");
-                        writer.newLine();
+            if (trueViewsql!=null&&trueViewsql.size()>0){
+                //获得 此答案下的所有考点权值
+//                System.out.println(trueViewsql);
+
+                for (ExamQuestionKeyword keyword : examQuestionKeywords) {
+                    String scoreRateStr = keyword.getScoreRate(); // 假设你有 getScorerate() 方法
+                    if (scoreRateStr != null && !scoreRateStr.isEmpty()) {
+                        try {
+                            totalScore += Integer.parseInt(scoreRateStr);
+                        } catch (NumberFormatException e) {
+                            System.err.println("无效的分数值: " + scoreRateStr);
+                        }
                     }
                 }
-                System.out.println("已过滤 " + newFile + "，仅保留与 " + baseFile + " 不同的 SQL 语句");
-            } catch (IOException e) {
-                System.err.println("过滤文件失败：" + newFile);
-                e.printStackTrace();
+                appendToFile(answerLogPath,"✅等价视图语句得分为: " + totalScore);
             }
-        }
+            if (falseViewsql != null && !falseViewsql.isEmpty()) {
+                System.out.println("//判断 关键点权值");
+                for (ExamQuestionKeyword keyword : examQuestionKeywords) {
+                    String key = keyword.getKeyword();
+                    String scoreRateStr = keyword.getScoreRate();
 
-        /**
-         * 比较备份文件与导出的数据库备份之间的差异，计算匹配比例
-         */
-        public static int compareBackupFiles(String exportedDatabaseFilePath, List<String> backupFiles) {
-            // 读取导出的数据库备份文件并按 SQL 语句进行分割
-            Set<String> exportedSqlStatements = readSqlStatements(exportedDatabaseFilePath);
-
-            // 用于存储符合条件的文件数量
-            int matchedCount = 0;
-
-            // 遍历其他备份文件进行比较
-            for (int i = 1; i < backupFiles.size(); i++) {
-                String currentFilePath = backupFiles.get(i);
-
-                // 读取当前备份文件并按 SQL 语句进行分割
-                Set<String> currentSqlStatements = readSqlStatements(currentFilePath);
-
-                // 输出当前备份文件中的所有 SQL 语句
-                System.out.println("文件 " + currentFilePath + " 中的 SQL 语句:");
-                for (String sql : currentSqlStatements) {
-                    System.out.println(sql);
-                }
-
-                // 判断当前备份文件中的每条 SQL 语句是否都在导出的数据库备份中
-                boolean allMatched = true;  // 假设所有 SQL 语句都匹配
-
-                for (String currentSql : currentSqlStatements) {
-                    if (!exportedSqlStatements.contains(currentSql)) {
-                        // 如果有任何一条 SQL 语句不在导出的数据库备份中，则设置 allMatched 为 false
-                        allMatched = false;
-                        System.out.println("未匹配的 SQL 语句: " + currentSql);  // 输出未匹配的 SQL 语句
+                    if (key != null && !key.isEmpty()) {
+                        for (String sql : falseViewsql) {
+                            if (sql.contains(key)) {
+                                try {
+                                    if (scoreRateStr != null && !scoreRateStr.isEmpty()) {
+                                        totalScore += Integer.parseInt(scoreRateStr);
+                                    }
+                                } catch (NumberFormatException e) {
+                                    System.err.println("无效的分数值: " + scoreRateStr);
+                                }
+                                break; // 找到一次匹配就跳出内层循环，避免重复加分
+                            }
+                        }
                     }
                 }
-
-                // 如果所有 SQL 语句都匹配，则计数器增加
-                if (allMatched) {
-                    matchedCount++;
-                }
-
-                // 输出当前文件的匹配率
-
-                System.out.println("文件 " + currentFilePath + " 与导出数据库的匹配结果: " + allMatched);
+                appendToFile(answerLogPath,"✅不等价视图中匹配到的关键点总得分为: " + totalScore);
+                totalScoreAnswer.addAndGet(totalScore);
             }
-
-            // 返回匹配的文件数量
-            return matchedCount;
         }
 
 
-        /**
-         * 读取 SQL 文件并按 `;` 进行分割，返回去重后的 SQL 语句集合
-         */
-        private static Set<String> readSqlStatements(String filePath) {
-            StringBuilder content = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    String trimmedLine = line.trim();
-                    if (!trimmedLine.isEmpty() && !trimmedLine.startsWith("--")) { // 忽略空行和注释
-                        content.append(trimmedLine).append(" "); // 以空格拼接，防止换行影响 SQL 语句完整性
+
+        try (Connection conn = DriverManager.getConnection(newDbUrl, user, password);
+             Statement stmt = conn.createStatement()) {
+
+
+
+            List<ExamQuestionKeyword> examQuestionKeywords=new ArrayList<>();
+            examQuestionKeywords.add(new ExamQuestionKeyword("","","DELETE FROM t_room","1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("","","WHERE","1"));
+            examQuestionKeywords.add(new ExamQuestionKeyword("","","roomId =1","1"));
+
+            int scoreRateSum = 0; // 最终得分累计
+
+            // 在方法中处理 delStatements
+            if (delStatements != null && delStatements.size() > 0) {
+                appendToFile(answerLogPath,"==================删除语句==================");
+                for (String delStatement : delStatements) {
+
+
+                    delStatement = delStatement.trim().replaceAll(";+\\s*$", "");
+
+                    // 正则提取表名和 WHERE 条件
+                    Pattern pattern = Pattern.compile("DELETE\\s+FROM\\s+(\\w+)\\s+WHERE\\s+(.+)", Pattern.CASE_INSENSITIVE);
+                    Matcher matcher = pattern.matcher(delStatement);
+
+                    if (matcher.find()) {
+                        String tableName = matcher.group(1).trim();
+                        String whereClause = matcher.group(2).trim();
+                        DeleteInfo deleteInfo = new DeleteInfo(tableName, whereClause);
+                        appendToFile(answerLogPath,"提取出的表名: " + deleteInfo.tableName);
+                        appendToFile(answerLogPath,"提取出的条件: " + deleteInfo.whereClause);
+                        // 构造验证 SQL
+                        String verifySql = "SELECT COUNT(*) FROM " + deleteInfo.tableName + " WHERE " + deleteInfo.whereClause;
+                        appendToFile(answerLogPath,"验证 SQL: " + verifySql);
+                        try (ResultSet rs = stmt.executeQuery(verifySql)) {
+                            if (rs.next()) {
+                                int count = rs.getInt(1);
+                                if (count == 0) {
+                                    //累加删除语句的所有权值  examQuestionKeywords累加scorerate
+                                    appendToFile(answerLogPath,"验证通过：符合 DELETE 条件的记录已删除。");
+                                    for (ExamQuestionKeyword keyword : examQuestionKeywords) {
+                                        scoreRateSum += Integer.parseInt(keyword.getScoreRate());
+                                    }
+
+                                } else {
+                                    appendToFile(answerLogPath,"验证失败：还有 " + count + " 条记录符合 DELETE 条件，未被删除。");
+                                }
+                            }
+                        } catch (SQLException e) {
+                            appendToFile(answerLogPath,"执行验证 SQL 出错！");
+                            e.printStackTrace();
+                        }
+                    } else {
+                        appendToFile(answerLogPath,"未能从 SQL 中提取 DELETE 信息！");
                     }
                 }
-            } catch (IOException e) {
-                System.err.println("读取文件失败：" + filePath);
-                e.printStackTrace();
+            }
+            totalScoreAnswer.addAndGet(scoreRateSum);
+
+            appendToFile(answerLogPath,"✅删除正确最终得分: " + scoreRateSum);
+            String directoryPath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\结果素材\\结果素材\\Teacher";
+
+
+            //select语句
+            if (selectStatements != null && selectStatements.size() > 0) {
+                appendToFile(answerLogPath,"==================查找语句==================");
+//                selectStatements.forEach(System.out::println);
+
+                for (String selectStatement : selectStatements) {
+                    String normalizedSelect = selectStatement.trim().replaceAll("\\s+", "").toLowerCase();
+                    AtomicBoolean foundMatch = new AtomicBoolean(false); // 添加标记变量
+                    try {
+                        Files.walk(Paths.get(directoryPath))
+                                .filter(Files::isRegularFile)
+                                .forEach(filePaths -> {
+                                            try {
+                                                String fileContent = Files.readString(filePaths, StandardCharsets.UTF_8);
+                                                String normalizedFileContent = fileContent.trim().replaceAll("\\s+", "").toLowerCase();
+
+                                                if (normalizedSelect.equals(normalizedFileContent)) {
+
+                                                    String stuPath="C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\考试素材\\考试素材\\Student\\"+filePaths.getFileName();
+//                                            System.out.println("结果语句："+selectStatement);
+
+
+                                                    String stuAnswer = readSQLFromFile(stuPath);
+//                                            System.out.println("考生语句"+stuAnswer);
+                                                    List<List<String>> answerList;
+                                                    try (ResultSet answer = stmt.executeQuery(selectStatement) ) {
+                                                        answerList = getAnswerList(answer);
+                                                    }
+                                                    List<List<String>> stuanswerList ;
+                                                    try (ResultSet stuanswer = stmt.executeQuery(stuAnswer) ) {
+                                                        stuanswerList = getAnswerList(stuanswer);
+                                                    }
+                                                    appendToFile(answerLogPath,"执行考生答案的查询结果：");
+                                                    printResult(answerList);
+                                                    appendToFile(answerLogPath,"执行正确答案的查询结果：");
+                                                    printResult(stuanswerList);
+
+
+                                                    boolean isEquivalent = compareResultsSelect(answerList, stuanswerList);
+                                                    appendToFile(answerLogPath,"\n是否结果等价: " + isEquivalent);
+                                                    if (isEquivalent){
+                                                        foundMatch.set(true); // 设为 true，表示找到了匹配
+                                                    }
+
+                                                }
+                                            } catch (Exception e) {
+                                                appendToFile(answerLogPath,"读取文件失败：" + filePaths);
+                                                e.printStackTrace();
+                                            }
+                                        }
+
+
+                                );
+                        int totalScore = 0;
+                        //判断标记是否为true
+                        if (foundMatch.get()) {
+                            //todo 根据试题答案id去找 答案下的关键字
+                            List<ExamQuestionKeyword> examQuestionKeywordsql=new ArrayList<>();
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","description AS 超时任务描述","1"));
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","earnedScore AS 实际得分","1"));
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","baseScore AS 基础分","1"));
+
+                            for (ExamQuestionKeyword keywordObj : examQuestionKeywordsql) {
+                                totalScore += Integer.parseInt(keywordObj.getScoreRate());
+                            }
+
+                        } else {
+                            System.out.println("该 SQL 在任何文件中都未找到匹配或结果不等价：\n" + selectStatement);
+                            List<ExamQuestionKeyword> examQuestionKeywordsql=new ArrayList<>();
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","description AS 任务描述","1"));
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","teamName AS 队伍名称","1"));
+                            examQuestionKeywordsql.add(new ExamQuestionKeyword("","","isCompleted = 0","1"));
+
+                            for (ExamQuestionKeyword keywordObj : examQuestionKeywordsql) {
+                                if (selectStatement.contains(keywordObj.getKeyword())) {
+                                    totalScore += Integer.parseInt(keywordObj.getScoreRate());
+                                }
+                            }
+                        }
+                        totalScoreAnswer.addAndGet(totalScore);
+                        appendToFile(answerLogPath,"✅当前查询SQL得分为：" + totalScore);
+                    } catch (IOException e) {
+                        appendToFile(answerLogPath,"遍历目录出错！");
+                        e.printStackTrace();
+                    }
+
+
+                }
             }
 
-            // 按 `;` 进行分割，并去重
-            return Arrays.stream(content.toString().split(";"))
-                    .map(String::trim)
-                    .filter(sql -> !sql.isEmpty())
-                    .collect(Collectors.toSet());
+
+
+
+
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
         }
 
+
+        //触发器
+
+        // 触发器处理
+        if (triggerStatements != null && triggerStatements.size() > 0) {
+            appendToFile(answerLogPath,"==================触发器语句==================");
+            for (String triggerStatement : triggerStatements) {
+                String directoryPath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\结果素材\\结果素材\\Teacher";
+
+
+
+                // 清洗触发器语句（去除注释等）
+                String triggerStatementClean = cleanProcedureSQL(triggerStatement);
+
+                // 标准化触发器内容（去空格、换行、小写）
+                String normalizedTrigger = triggerStatementClean.trim().replaceAll("\\s+", "").toLowerCase();
+
+                AtomicBoolean foundMatch = new AtomicBoolean(false);
+
+                try {
+                    Files.walk(Paths.get(directoryPath))
+                            .filter(Files::isRegularFile)
+                            .forEach(filePathtir -> {
+                                try {
+                                    String fileContent = Files.readString(filePathtir, StandardCharsets.UTF_8);
+                                    String normalizedFileContent = fileContent.trim().replaceAll("\\s+", "").toLowerCase();
+
+                                    if (normalizedTrigger.equals(normalizedFileContent)) {
+
+                                        foundMatch.set(true);
+                                        // 学生答题路径
+                                        String stuPath="C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\考试素材\\考试素材\\Student\\"+filePathtir.getFileName();
+                                        //考试素材
+                                        String examPath=directoryPath+"\\"+filePathtir.getFileName();
+
+
+                                        String stuAnswer = readSQLFromFile(stuPath);
+
+                                        String examAnswer =readSQLFromFile(examPath);
+
+                                        // 预处理两个字符串：去除所有空白符（空格、制表符、换行）
+                                        String processedTrigger = examAnswer.replaceAll("\\s+", "").toLowerCase();
+                                        String processedAnswer = stuAnswer.replaceAll("\\s+", "").toLowerCase();
+
+                                        // 比较是否完全相等
+                                        int totalScore=0;
+                                        List<ExamQuestionKeyword> examQuestionKeywordsql=new ArrayList<>();
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","CREATE TRIGGER tri_calculate_score","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","BEFORE INSERT ON t_mission_completion","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","WHERE missionId = NEW.missionId","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","IF NEW.isCompleted = 1 THEN","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","IF NEW.completionTime <= v_base_time THEN","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","ELSE","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","END IF","1"));
+                                        examQuestionKeywordsql.add(new ExamQuestionKeyword("","","ELSE SET NEW.earnedScore = 0; END IF","1"));
+                                        if (processedTrigger.equals(processedAnswer)) {
+                                            appendToFile(answerLogPath,"考生答案与标准答案语句内容一致（忽略格式）");
+
+                                            for (ExamQuestionKeyword keywordObj : examQuestionKeywordsql) {
+                                                totalScore += Integer.parseInt(keywordObj.getScoreRate());
+                                            }
+                                        }else {
+                                            for (ExamQuestionKeyword examQuestionKeyword : examQuestionKeywordsql) {
+                                                String keyword = Pattern.quote(examQuestionKeyword.getKeyword());
+                                                Pattern pattern = Pattern.compile("\\b" + keyword + "\\b", Pattern.CASE_INSENSITIVE);
+                                                Matcher matcher = pattern.matcher(stuAnswer);
+
+                                                if (matcher.find()) {
+                                                    totalScore += Integer.parseInt(examQuestionKeyword.getScoreRate());
+                                                }
+
+                                            }
+                                        }
+                                        totalScoreAnswer.addAndGet(totalScore);
+                                        appendToFile(answerLogPath,"✅触发器得分点"+totalScore);
+                                    }
+                                } catch (IOException e) {
+                                    appendToFile(answerLogPath,"读取文件失败: " + filePath + "，错误: " + e.getMessage());
+                                }
+                            });
+
+                    if (!foundMatch.get()) {
+                        appendToFile(answerLogPath,"未找到匹配触发器：" + triggerStatement.substring(0, Math.min(triggerStatement.length(), 100)) + "...");
+                    }
+
+                } catch (IOException e) {
+                    appendToFile(answerLogPath,"遍历学生目录出错: " + e.getMessage());
+
+                }
+            }
+        }
+
+
+
+        //储存过程
+        if (procedureStatements!=null&&procedureStatements.size()>0){
+            appendToFile(answerLogPath,"==================储存过程==================");
+            for (String procedureStatement : procedureStatements) {
+                //根据 存储过程语句 查找 文件名
+                String directoryPath = "C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\结果素材\\结果素材\\Teacher";
+
+                String procedureStatementClean = cleanProcedureSQL(procedureStatement);
+                String normalizedProcedure = procedureStatementClean.trim().replaceAll("\\s+", "").toLowerCase();
+                AtomicBoolean foundMatch = new AtomicBoolean(false);
+
+                try {
+                    Files.walk(Paths.get(directoryPath))
+                            .filter(Files::isRegularFile)
+                            .forEach(filePathpro -> {
+                                try {
+                                    String fileContent = Files.readString(filePathpro, StandardCharsets.UTF_8);
+                                    String normalizedFileContent = fileContent.trim().replaceAll("\\s+", "").toLowerCase();
+
+                                    if (normalizedProcedure.equals(normalizedFileContent)) {
+//                                        System.out.println("匹配成功！存储过程在文件中找到: " + filePathpro.getFileName());
+                                        foundMatch.set(true);
+
+
+                                        List<String> extractCallStatements = extractCallStatements(procedureStatement);
+//                                        String callStatement = extractCallStatements(procedureStatement);
+                                        // 输出提取的 CALL 语句
+                                        if (extractCallStatements != null&&extractCallStatements.size()>0) {
+                                            for (String extractCallStatement : extractCallStatements) {
+                                                appendToFile(answerLogPath,"测试语句："+extractCallStatement);
+                                            }
+
+                                        } else {
+                                            appendToFile(answerLogPath,"未找到 CALL 语句");
+                                        }
+                                        //todo 学生数据库
+                                        String userDb="mys_010_122";
+                                        String stuDbUrl = "jdbc:mysql://localhost:3306/" + userDb + "?useSSL=false&serverTimezone=Asia/Shanghai";
+                                        try (Connection newConn = DriverManager.getConnection(newDbUrl, user, password);
+                                             Statement newStmt = newConn.createStatement()) {
+                                            //这里先执行 procedureStatement 语句
+
+                                            // 第一个数据库：创建存储过程
+                                            newStmt.execute(procedureStatementClean); // 创建存储过程
+
+                                            // 执行第一个数据库的 CALL 语句并获取结果
+
+                                            List<Map<String, Object>> newResults = new ArrayList<>();
+                                            if (extractCallStatements != null && !extractCallStatements.isEmpty()) {
+                                                for (String extractCallStatement : extractCallStatements) {
+                                                    try {
+                                                        ResultSet newResult = newStmt.executeQuery(extractCallStatement);
+                                                        newResults.addAll(extractResults(newResult));
+                                                    } catch (SQLException e) {
+                                                        appendToFile(answerLogPath, "执行标准库 SQL CALL 语句时发生错误: " + e.getMessage());
+                                                    }
+                                                }
+                                            }
+
+
+
+                                            try (Connection oldConn = DriverManager.getConnection(stuDbUrl, user, password);
+                                                 Statement oldStmt = oldConn.createStatement()) {
+                                                String stuPath="C:\\Users\\20373\\Desktop\\202504211120_mysql\\71\\MYS_010_122\\考试素材\\考试素材\\Student\\"+filePathpro.getFileName();
+
+                                                String stuAnswer = readSQLFromFile(stuPath);
+
+                                                try {
+                                                    //把学生答题路径下的文件sql拿出，创建存储过程
+                                                    oldStmt.execute(stuAnswer);
+
+                                                } catch (SQLException e) {
+                                                    appendToFile(answerLogPath,"执行 SQL 语句时发生错误: " + e.getMessage());
+
+                                                }
+
+                                                List<Map<String, Object>> oldResults = new ArrayList<>();
+                                                if (extractCallStatements != null && !extractCallStatements.isEmpty()) {
+                                                    for (String extractCallStatement : extractCallStatements) {
+                                                        try {
+                                                            ResultSet oldResult = oldStmt.executeQuery(extractCallStatement);
+                                                            oldResults.addAll(extractResults(oldResult));
+                                                        } catch (SQLException e) {
+                                                            appendToFile(answerLogPath, "执行学生库 SQL CALL 语句时发生错误: " + e.getMessage());
+                                                        }
+                                                    }
+                                                }
+
+
+
+                                                // 比较结果
+                                                boolean b = compareExtractResults(newResults, oldResults);
+
+                                                appendToFile(answerLogPath,"考生答案与标准答案语句结果为:"+b );
+
+
+                                                int totalScore=0;
+                                                List<ExamQuestionKeyword> examQuestionKeywordsql=new ArrayList<>();
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","PROCEDURE","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","pro_getMaxScore","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","in_theme_keyword","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","VARCHAR(50)","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","WHERE","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","LIKE","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","CONCAT","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","DESC","1"));
+                                                examQuestionKeywordsql.add(new ExamQuestionKeyword("","","LIMIT","1"));
+                                                if (b){
+                                                    for (ExamQuestionKeyword keywordObj : examQuestionKeywordsql) {
+                                                        totalScore += Integer.parseInt(keywordObj.getScoreRate());
+                                                    }
+                                                }else {
+
+                                                    for (ExamQuestionKeyword keywordObj : examQuestionKeywordsql) {
+                                                        if (stuAnswer.contains(keywordObj.getKeyword())) {
+                                                            totalScore += Integer.parseInt(keywordObj.getScoreRate());
+                                                        }
+                                                    }
+
+                                                }
+                                                appendToFile(answerLogPath,"✅存储过程得分"+totalScore);
+
+                                                totalScoreAnswer.addAndGet(totalScore);
+                                            } catch (SQLException e) {
+                                                System.out.println("Error connecting to old database: " + e.getMessage());
+                                            }
+
+                                            //删除临时创建的数据库databaseName
+                                            String dropDbSql = "DROP DATABASE " + databaseName;
+                                            newStmt.executeUpdate(dropDbSql);
+                                            System.out.println("已删除数据库：" + databaseName);
+                                        } catch (SQLException e) {
+                                            System.out.println("Error connecting to new database: " + e.getMessage());
+                                        }
+
+
+
+
+
+
+                                    }
+
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            });
+
+                    if (!foundMatch.get()) {
+
+                        System.out.println("❌ 没有找到匹配的存储过程文件: \n" + procedureStatementClean);
+                    }
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        //把生成的文件删掉
+        File file = new File(exportedDatabaseFilePath);
+        if (file.exists()) {
+            file.delete();
+        } else {
+            System.out.println("文件不存在: " + file);
+        }
+        for (String backupFile : backupFiles) {
+            File fileback = new File(backupFile);
+            if (fileback.exists()) {
+                fileback.delete();
+            } else {
+                System.out.println("文件不存在: " + fileback);
+            }
+        }
+
+        return totalScoreAnswer;
+
     }
+    /**
+     * 将指定内容追加写入到指定文件中。
+     *
+     * @param filePath 文件路径
+     * @param content  要写入的内容
+     */
+    public static void appendToFile(String filePath, String content) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath, true))) {
+            writer.write(content);
+            writer.newLine(); // 可选：添加换行符
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    public static String cleanProcedureSQL(String sql) {
+        // 删除 DELIMITER 和 $$ 标记
+        sql = sql.replaceAll("(?i)DELIMITER\\s+\\$\\$", "");  // 删除 DELIMITER $$
+        sql = sql.replaceAll("(?i)DELIMITER\\s+;", "");        // 删除 DELIMITER ;
+        sql = sql.replaceAll("\\$\\$", "");                   // 删除结尾 $$
+
+        // 删除 CALL 语句（例如 CALL pro_xxx(...);）
+        sql = sql.replaceAll("(?i)CALL\\s+[^;]+;", "");        // 删除 CALL 语句（不区分大小写）
+
+        return sql.trim(); // 去除首尾空格
+    }
+
+
+    // 提取ResultSet中的结果到一个列表中
+    private static List<Map<String, Object>> extractResults(ResultSet resultSet) throws SQLException {
+        List<Map<String, Object>> results = new ArrayList<>();
+
+        // 获取列数
+        ResultSetMetaData metaData = resultSet.getMetaData();
+        int columnCount = metaData.getColumnCount();
+
+        while (resultSet.next()) {
+            Map<String, Object> row = new HashMap<>();
+            for (int i = 1; i <= columnCount; i++) {
+                String columnName = metaData.getColumnLabel(i);
+                Object value = resultSet.getObject(i);
+                row.put(columnName, value);
+            }
+            results.add(row);
+        }
+
+        return results;
+    }
+
+    // 比较两个结果集
+    private static boolean compareExtractResults(List<Map<String, Object>> newResults, List<Map<String, Object>> oldResults) {
+        appendToFile(answerLogPath,"==== 标准答案 ====");
+        System.out.println("");
+        for (Map<String, Object> row : newResults) {
+            appendToFile(answerLogPath,row.toString());
+        }
+        appendToFile(answerLogPath,"==== 考生答案 ====");
+        for (Map<String, Object> row : oldResults) {
+            appendToFile(answerLogPath,row.toString());
+        }
+
+        if (newResults.size() != oldResults.size()) {
+            appendToFile(answerLogPath,"❌考生答案与标准答案个数不对");
+
+            return false;
+        }
+
+        // 不比较顺序，直接判断两个列表内容是否一样（将其转换为 Set）
+        Set<Map<String, Object>> newSet = new HashSet<>(newResults);
+        Set<Map<String, Object>> oldSet = new HashSet<>(oldResults);
+
+        if (!newSet.equals(oldSet)) {
+
+            appendToFile(answerLogPath,"❌ 内容相同但顺序不同，或存在差异：");
+            Set<Map<String, Object>> onlyInNew = new HashSet<>(newSet);
+            onlyInNew.removeAll(oldSet);
+
+            Set<Map<String, Object>> onlyInOld = new HashSet<>(oldSet);
+            onlyInOld.removeAll(newSet);
+
+            for (Map<String, Object> row : onlyInNew) {
+                appendToFile(answerLogPath,"⚠️ 标准答案中有但考生答案中没有: " + row);
+
+            }
+
+            for (Map<String, Object> row : onlyInOld) {
+                appendToFile(answerLogPath,"⚠️ 考生答案中有但标准答案中没有: " + row);
+
+            }
+
+            return false;
+        }
+        appendToFile(answerLogPath,"两个结果集内容一致（不考虑顺序）！");
+        return true;
+    }
+
+
+
+    public static List<String> extractCallStatements(String sql) {
+        List<String> callStatements = new ArrayList<>();
+        Pattern callPattern = Pattern.compile("CALL\\s+\\w+\\s*\\([^;]*?\\);", Pattern.CASE_INSENSITIVE);
+        Matcher matcher = callPattern.matcher(sql);
+
+        while (matcher.find()) {
+            callStatements.add(matcher.group());
+        }
+
+        return callStatements;
+    }
+
+
+
+    /**
+     * 比较两个查询的结果
+     */
+    private static boolean compareResultsSelect(List<List<String>> result1, List<List<String>> result2) {
+        // 获取列名并比较（顺序无关）
+        List<String> columnNames1 = result1.get(0);
+        List<String> columnNames2 = result2.get(0);
+
+        // 检查列名是否一致（顺序无关）
+        Set<String> columnSet1 = new HashSet<>(columnNames1);
+        Set<String> columnSet2 = new HashSet<>(columnNames2);
+        if (!columnSet1.equals(columnSet2)) {
+            return false;
+        }
+
+        // 获取数据行（去除列名）
+        List<List<String>> rows1 = result1.subList(1, result1.size());
+        List<List<String>> rows2 = result2.subList(1, result2.size());
+
+        // 使用 Set 存储每行数据并比较
+        Set<Set<String>> rowSet1 = new HashSet<>();
+        for (List<String> row : rows1) {
+            rowSet1.add(new HashSet<>(row));
+        }
+
+        Set<Set<String>> rowSet2 = new HashSet<>();
+        for (List<String> row : rows2) {
+            rowSet2.add(new HashSet<>(row));
+        }
+
+        // 比较行数据（无顺序）
+        return rowSet1.equals(rowSet2);
+    }
+    private static List<List<String>> getAnswerList(ResultSet answer) throws SQLException {
+        List<List<String>> result = new ArrayList<>();
+        // 获取列数和列名
+        ResultSetMetaData metaData = answer.getMetaData();
+        int columnCount = metaData.getColumnCount();
+
+        // 获取列名
+        List<String> columnNames = new ArrayList<>();
+        for (int i = 1; i <= columnCount; i++) {
+            columnNames.add(metaData.getColumnLabel(i));
+        }
+        result.add(columnNames); // 将列名添加为结果的第一行
+
+        // 遍历结果集
+        while (answer.next()) {
+            List<String> row = new ArrayList<>();
+            for (int i = 1; i <= columnCount; i++) {
+                row.add(answer.getString(i));
+            }
+            result.add(row);
+        }
+
+        return result;
+
+    }
+    /**
+     * 从文件读取 SQL 语句
+     */
+    private static String readSQLFromFile(String filePath) throws IOException {
+        StringBuilder sql = new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sql.append(line).append(" ");
+            }
+        }
+        return sql.toString().trim(); // 返回合并后的 SQL 语句
+    }
+
+    public static class DeleteInfo {
+        public String tableName;
+        public String whereClause;
+
+        public DeleteInfo(String tableName, String whereClause) {
+            this.tableName = tableName;
+            this.whereClause = whereClause;
+        }
+    }
+
+    /**
+     * 打印查询结果
+     */
+    private static void printResult(List<List<String>> result) {
+        if (result.isEmpty()) {
+            appendToFile(answerLogPath,"查询结果为空");
+        } else {
+            // 打印每一行数据
+            for (int i = 0; i < result.size(); i++) {
+                List<String> row = result.get(i);
+                if (i == 0) { // 打印列名
+                    appendToFile(answerLogPath,"列名：");
+                }
+                for (String value : row) {
+                    appendToFile(answerLogPath,value + "\t");
+                }
+                System.out.println();
+            }
+        }
+    }
+
+    /**
+     * 执行 SQL 查询并返回结果
+     */
+    private static List<List<String>> executeQuery(Statement stmt, String sql) throws SQLException {
+        List<List<String>> result = new ArrayList<>();
+        ResultSet rs = stmt.executeQuery(sql);
+
+        // 获取列数和列名
+        ResultSetMetaData metaData = rs.getMetaData();
+        int columnCount = metaData.getColumnCount();
+
+        // 获取列名
+        List<String> columnNames = new ArrayList<>();
+        for (int i = 1; i <= columnCount; i++) {
+            columnNames.add(metaData.getColumnLabel(i));
+        }
+        result.add(columnNames); // 将列名添加为结果的第一行
+
+        // 遍历结果集
+        while (rs.next()) {
+            List<String> row = new ArrayList<>();
+            for (int i = 1; i <= columnCount; i++) {
+                row.add(rs.getString(i));
+            }
+            result.add(row);
+        }
+        return result;
+    }
+    /**
+     * 使用提供的正则表达式模式从给定的 SQL 语句中提取视图名称。
+     */
+    private static String extractViewName(String sql, String regex) {
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(sql);
+
+        // 如果找到匹配项，返回匹配到的视图名称
+        if (matcher.find()) {
+            return matcher.group(1).replace("`", ""); // 如果有反引号（`），则移除
+        } else {
+            return "未找到视图名称";
+        }
+    }
+
+
+    /**
+     * 比较两个查询的结果
+     */
+    private static boolean compareResults(List<List<String>> result1, List<List<String>> result2) {
+        // 获取列名并比较（顺序无关）
+        List<String> columnNames1 = result1.get(0);
+        List<String> columnNames2 = result2.get(0);
+
+        // 检查列名是否一致（顺序无关）
+        Set<String> columnSet1 = new HashSet<>(columnNames1);
+        Set<String> columnSet2 = new HashSet<>(columnNames2);
+        if (!columnSet1.equals(columnSet2)) {
+            return false;
+        }
+
+        // 获取数据行（去除列名）
+        List<List<String>> rows1 = result1.subList(1, result1.size());
+        List<List<String>> rows2 = result2.subList(1, result2.size());
+
+        // 使用 Set 存储每行数据并比较
+        Set<Set<String>> rowSet1 = new HashSet<>();
+        for (List<String> row : rows1) {
+            rowSet1.add(new HashSet<>(row));
+        }
+
+        Set<Set<String>> rowSet2 = new HashSet<>();
+        for (List<String> row : rows2) {
+            rowSet2.add(new HashSet<>(row));
+        }
+
+        // 比较行数据（无顺序）
+        return rowSet1.equals(rowSet2);
+    }
+
+
+    // 去除 SQL 中的注释部分
+    private static String removeComments(String sql) {
+        // 正则表达式匹配 SQL 中以 -- 开头的注释
+        return sql.replaceAll("(?m)^[\\s]*--.*$", "");
+    }
+    public static List<String> getAnswerView(String filePath) throws IOException {
+        String fileContent = new String(Files.readAllBytes(Paths.get(filePath)));
+
+        // 去掉换行和多余空白，方便正则识别完整语句
+        fileContent = fileContent.replaceAll("[\\r\\n]+", " ").replaceAll("\\s+", " ");
+
+        List<String> viewStatements = new ArrayList<>();
+
+        // 正则表达式匹配各种形式的 CREATE VIEW
+        Pattern viewPattern = Pattern.compile(
+                "(?i)(CREATE(\\s+OR\\s+REPLACE)?(\\s+ALGORITHM\\s*=\\s*\\w+)?(\\s+DEFINER\\s*=\\s*[`\"'\\w@%\\.]+)?(\\s+SQL\\s+SECURITY\\s+\\w+)?\\s+VIEW\\b.*?;)",
+                Pattern.CASE_INSENSITIVE);
+        Matcher matcher = viewPattern.matcher(fileContent);
+
+        while (matcher.find()) {
+            viewStatements.add(matcher.group(1).trim());
+        }
+
+        return viewStatements;
+    }
+
+
+
+
+    // 根据 tableName 查找 CREATE TABLE 语句
+    public static List<String> findCreateTableStatements(Map<String, String> baseData, Map<String, String> newData, String tableName) {
+        List<String> createStatements = new ArrayList<>();
+
+        // 1. 检查 newData 中是否包含 tableName
+        if (newData.containsKey(tableName)) {
+            createStatements.add(newData.get(tableName)); // 如果有，返回对应的 CREATE TABLE 语句
+        } else {
+            // 2. 如果 newData 中没有该 tableName，比较 newData 和 baseData，找出 newData 中多出的建表语句
+            for (String newTable : newData.keySet()) {
+                // 如果 newData 中的表在 baseData 中没有找到，说明是新增加的表
+                if (!baseData.containsKey(newTable)) {
+                    createStatements.add(newData.get(newTable)); // 将新表的 CREATE TABLE 语句加入结果列表
+                }
+            }
+        }
+
+        return createStatements;
+    }
+
+    public static String getPrimaryKeyFromSqlFile(String fileName, String tableName) {
+        StringBuilder sqlBuilder = new StringBuilder();
+        boolean inTargetTable = false;
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                line = line.trim();
+                if (!inTargetTable) {
+                    // 找到对应的建表语句
+                    if (line.toUpperCase().startsWith("CREATE TABLE") && line.contains(tableName)) {
+                        inTargetTable = true;
+                    }
+                } else {
+                    sqlBuilder.append(line);
+
+                    // 一般 PRIMARY KEY 会在 CREATE TABLE 块里，或者当前行
+                    if (line.toUpperCase().contains("PRIMARY KEY")) {
+                        // 用正则提取主键字段名
+                        Pattern pattern = Pattern.compile("PRIMARY KEY\\s*\\((.*?)\\)", Pattern.CASE_INSENSITIVE);
+                        Matcher matcher = pattern.matcher(line);
+                        if (matcher.find()) {
+                            String primaryKeyField = matcher.group(1).replace("`", "").trim();
+                            return primaryKeyField;
+                        }
+                    }
+
+                    // 检查建表语句是否结束
+                    if (line.endsWith(";")) {
+                        inTargetTable = false;
+                        sqlBuilder.setLength(0); // 清空，防止错误解析别的表
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null; // 没找到
+    }
+
+
+
+
+    // 解析 SQL 文件，只提取 CREATE TABLE 语句
+    public static Map<String, String> parseSqlFile(String fileName) {
+        Map<String, String> tableMap = new HashMap<>();
+        StringBuilder sqlBuilder = new StringBuilder();
+        boolean isCreateTable = false; // 是否正在解析一个 CREATE TABLE
+
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                line = line.trim();
+                if (line.isEmpty()) {
+                    continue; // 空行跳过
+                }
+
+                // 检查是否是 CREATE TABLE 开始
+                if (line.toUpperCase().startsWith("CREATE TABLE")) {
+                    isCreateTable = true;
+                    sqlBuilder.setLength(0); // 清空上一次内容
+                }
+
+                if (isCreateTable) {
+                    sqlBuilder.append(line).append(" "); // 保持空格分隔，防止黏在一起
+
+                    // 检查是否结束了（以 COLLATE=xxx; 或 ); 结尾）
+                    if (line.endsWith(";")) {
+                        String sqlStatement = sqlBuilder.toString().trim();
+                        String tableName = extractTableName(sqlStatement);
+
+                        if (tableName != null) {
+                            tableMap.put(tableName, sqlStatement);
+                        }
+                        isCreateTable = false; // 结束当前 CREATE TABLE
+                        sqlBuilder.setLength(0); // 清空准备下一个
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return tableMap;
+    }
+
+    // 从 CREATE TABLE 语句中提取表名
+    // 提取 CREATE TABLE 中的表名
+    private static String extractTableName(String sql) {
+        Pattern pattern = Pattern.compile("CREATE TABLE [`\"]?(\\w+)[`\"]?", Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(sql);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return null;
+    }
+    // 根据 keywords 检查 insertDifferences 中是否全字段匹配并累加 scoreRate
+    public static int calculateTotalScoreRate(List<String> insertDifferences, List<ExamQuestionKeyword> examQuestionKeywords) {
+        int totalScoreRate = 0;
+        Set<String> matchedKeywords = new HashSet<>();
+
+        for (String insertSql : insertDifferences) {
+            for (ExamQuestionKeyword keyword : examQuestionKeywords) {
+                String keywordValue = keyword.getKeyword();
+                if (keywordValue != null && !keywordValue.isEmpty() && !matchedKeywords.contains(keywordValue)) {
+                    // 使用正则，确保是完整单词（字段）匹配
+                    String regex = "(?i)([^\\w]|^)" + Pattern.quote(keywordValue) + "([^\\w]|$)";
+                    if (insertSql.matches(".*" + regex + ".*")) {
+                        try {
+                            totalScoreRate += Integer.parseInt(keyword.getScoreRate());
+                            matchedKeywords.add(keywordValue);
+                        } catch (NumberFormatException e) {
+                            System.err.println("Invalid scoreRate format for keyword: " + keywordValue);
+                        }
+                    }
+                }
+            }
+        }
+        return totalScoreRate;
+    }
+
+
+
+
+    /**
+     * 通过命令行执行 SQL 文件
+     */
+    private static boolean executeSqlFileUsingCommandLine(String filePath, String databaseName, String user, String password) throws IOException {
+        // 构建 MySQL 命令
+        String command = String.format("mysql -u %s -p%s %s < %s", user, password, databaseName, filePath);
+
+        // 使用 ProcessBuilder 执行命令
+        ProcessBuilder processBuilder = new ProcessBuilder("cmd.exe", "/c", command);
+        processBuilder.inheritIO();  // 将输入输出重定向到当前控制台
+        Process process = processBuilder.start();
+
+        try {
+            // 等待命令执行完成
+            int exitCode = process.waitFor();
+            if (exitCode == 0) {
+                System.out.println("SQL 文件执行成功：" + filePath);
+                return true;  // 返回 true 表示执行成功
+            } else {
+                System.err.println("SQL 文件执行失败：" + filePath);
+                return false;  // 返回 false 表示执行失败
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 执行其他 SQL 语句
+     */
+    private static List<SqlExecutionResult> executeOtherSqlStatements(List<String> otherStatements, String dbUrl, String user, String password) throws SQLException {
+        Integer fileName = 1;
+        String outputPath = "./";
+
+        backupFiles.add(outputPath + "0.sql");
+
+        List<SqlExecutionResult> executionResults = new ArrayList<>();
+
+        try (Connection conn = DriverManager.getConnection(dbUrl, user, password);
+             Statement stmt = conn.createStatement()) {
+
+            for (String sql : otherStatements) {
+                String trimmedSql = sql.trim();
+                if (!trimmedSql.isEmpty() && !trimmedSql.startsWith("--")) {
+                    try {
+                        stmt.executeUpdate(trimmedSql);
+                        System.out.println("成功执行 SQL: " + trimmedSql);
+
+                        String backupFile = outputPath + fileName + ".sql";
+                        MySQLExporterUtil exporter = new MySQLExporterUtil(databaseName, user, password, fileName.toString());
+                        exporter.export();
+
+                        backupFiles.add(backupFile);
+
+                        // 保存执行记录
+                        SqlExecutionResult result = new SqlExecutionResult(trimmedSql, backupFile);
+                        executionResults.add(result);
+
+                        fileName++;
+
+                    } catch (SQLException e) {
+                        System.err.println("执行 SQL 失败: " + trimmedSql);
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+            // 所有 SQL 执行完后，反向顺序进行备份文件比较
+            for (int i = backupFiles.size() - 1; i > 0; i--) {
+                String currentBackupFile = backupFiles.get(i);
+                String previousBackupFile = backupFiles.get(i - 1);
+                filterBackupFile(previousBackupFile, currentBackupFile);  // 比较差异
+
+
+            }
+        }
+
+        System.out.println("所有 SQL 语句执行完成");
+        executionResults.forEach(System.out::println);
+        return executionResults;
+    }
+
+    // 找出两个 List 中 insert 语句的差异
+    public static List<String> findInsertDifferences(List<Map<String, String>> baseData, List<Map<String, String>> newData) {
+        List<String> insertSqlList = new ArrayList<>(); // 用于存储所有新插入的 SQL 语句
+        // 比较 baseData 和 newData 之间的差异
+        for (Map<String, String> newRecord : newData) {
+            boolean isNew = true;
+            for (Map<String, String> oldRecord : baseData) {
+                if (oldRecord.equals(newRecord)) {
+                    isNew = false;
+                    break;
+                }
+            }
+            if (isNew) {
+                // 生成 INSERT 语句
+                String insertSql = generateInsertSql(newRecord);
+                insertSqlList.add(insertSql);
+            }
+        }
+        return insertSqlList; // 返回包含所有新 INSERT 语句的列表
+    }
+
+    // 根据 Map 生成 INSERT 语句
+    public static String generateInsertSql(Map<String, String> record) {
+        StringBuilder columns = new StringBuilder();
+        StringBuilder values = new StringBuilder();
+
+        for (Map.Entry<String, String> entry : record.entrySet()) {
+            if (columns.length() > 0) {
+                columns.append(", ");
+                values.append(", ");
+            }
+            columns.append(entry.getKey());
+            values.append("'").append(entry.getValue()).append("'");
+        }
+
+        return "INSERT INTO t_team (" + columns + ") VALUES (" + values + ");";
+    }
+    private static List<Map<String, String>> parseInsertStatements(String filePath, String tableName) throws IOException {
+        List<Map<String, String>> dataList = new ArrayList<>();
+        Pattern pattern = Pattern.compile(
+                "INSERT INTO\\s+" + tableName + "\\s*\\((.*?)\\)\\s*VALUES\\s*\\((.*?)\\);?",
+                Pattern.CASE_INSENSITIVE
+        );
+
+        try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
+            StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line.trim());
+            }
+            String content = sb.toString();
+            Matcher matcher = pattern.matcher(content);
+            while (matcher.find()) {
+                String columns = matcher.group(1);
+                String values = matcher.group(2);
+
+                String[] columnArray = columns.split(",");
+                String[] valueArray = values.split(",");
+
+                Map<String, String> data = new LinkedHashMap<>();
+                for (int i = 0; i < columnArray.length; i++) {
+                    data.put(columnArray[i].trim(), valueArray[i].trim().replace("'", ""));
+                }
+                dataList.add(data);
+            }
+        }
+        return dataList;
+    }
+
+    private static List<Map<String, String>> toMap(List<Map<String, String>> dataList) {
+        // 直接返回原始数据列表
+        return new ArrayList<>(dataList);
+    }
+
+    private static List<String> generateUpdateSql(Map<String, String> oldRecord, Map<String, String> newRecord, String tableName) {
+        List<String> updateSqlList = new ArrayList<>();  // 用来存储多个 SQL 语句
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("UPDATE ").append(tableName).append(" SET ");
+
+        // 存储变化字段
+        List<String> setParts = new ArrayList<>();
+        List<String> whereParts = new ArrayList<>();
+
+        // 遍历新记录和旧记录，检查字段变化
+        for (Map.Entry<String, String> entry : newRecord.entrySet()) {
+            String columnName = entry.getKey();
+            String newValue = entry.getValue();
+            String oldValue = oldRecord.get(columnName);
+
+            // 如果值发生了变化
+            if (oldValue != null && !oldValue.equals(newValue)) {
+                // 将变化的字段加入 SET 部分
+                setParts.add(columnName + " = '" + newValue + "'");
+            }
+
+            // 始终将字段加入 WHERE 部分（无论是否变化）
+            whereParts.add(columnName + " = '" + oldValue + "'");
+        }
+
+        // 如果有变化的字段
+        if (!setParts.isEmpty()) {
+            sb.append(String.join(", ", setParts));
+            sb.append(" WHERE ");
+            sb.append(String.join(" AND ", whereParts));
+            sb.append(";");
+            updateSqlList.add(sb.toString());  // 将生成的 SQL 语句加入到列表
+        } else {
+            // 没有变化的数据，可能不需要更新，视具体情况而定
+            updateSqlList.add("No changes detected.");
+        }
+
+        return updateSqlList;  // 返回包含 SQL 语句的列表
+    }
+
+
+
+
+
+    /**
+     * 过滤 `backup_X.sql`，只保留与 `backup_0.sql` 不同的 SQL 语句（按 `;` 进行断句）
+     */
+    public static void filterBackupFile(String baseFile, String newFile) {
+        try {
+            Set<String> baseSqlSet = readSqlStatements(baseFile).stream()
+                    .map(MysqlServericeImpl::normalizeSql) // 归一化处理空格
+                    .collect(Collectors.toSet());
+
+            List<String> newSqlList = readSqlStatements(newFile).stream()
+                    .filter(sql -> !baseSqlSet.contains(normalizeSql(sql))) // 归一化后再比较
+                    .collect(Collectors.toList());
+
+            try (BufferedWriter writer = new BufferedWriter(new FileWriter(newFile))) {
+                for (String sql : newSqlList) {
+                    writer.write(sql + ";");
+                    writer.newLine();
+                }
+            }
+//            System.out.println("已过滤 " + newFile + "，仅保留与 " + baseFile + " 不同的 SQL 语句");
+        } catch (IOException e) {
+            System.err.println("过滤文件失败：" + newFile);
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 比较备份文件与导出的数据库备份之间的差异，计算匹配比例
+     */
+    public static List<SqlExecutionResult> compareBackupFiles(String exportedDatabaseFilePath, List<SqlExecutionResult> sqlExecutionResults) {
+        // 读取导出的数据库备份文件并按 SQL 语句进行分割
+        Set<String> exportedSqlStatements = readSqlStatements(exportedDatabaseFilePath);
+
+        // 遍历每个 sqlExecutionResult
+        for (SqlExecutionResult result : sqlExecutionResults) {
+            String currentFilePath = result.getBackupFile();
+
+            // 读取当前备份文件并按 SQL 语句进行分割
+            Set<String> currentSqlStatements = readSqlStatements(currentFilePath);
+
+            // 输出当前备份文件中的所有 SQL 语句
+//            System.out.println("文件 " + currentFilePath + " 中的 SQL 语句:");
+            for (String sql : currentSqlStatements) {
+                System.out.println(sql);
+            }
+
+            boolean allMatched = true;  // 假设当前文件中所有 SQL 语句都能在总备份中找到
+
+            for (String currentSql : currentSqlStatements) {
+                String normalizedSql = normalizeSql(currentSql);
+
+                boolean isMatched = exportedSqlStatements.stream()
+                        .map(MysqlServericeImpl::normalizeSql)
+                        .anyMatch(exportedSql -> exportedSql.equals(normalizedSql));
+
+                if (!isMatched) {
+                    allMatched = false;
+//                    System.out.println("未匹配的 SQL 语句: " + currentSql);
+                }
+            }
+
+            // 根据匹配结果更新 isValid 字段
+            result.setValid(allMatched);
+
+            // 输出每条 SQL 对应的校验结果
+//            System.out.println("文件 " + currentFilePath + " 的匹配结果: " + allMatched);
+        }
+
+        // 返回更新过 isValid 的列表
+        return sqlExecutionResults;
+    }
+
+
+
+    /**
+     * 读取 SQL 文件并按 `;` 进行分割，返回去重后的 SQL 语句集合
+     */
+    private static Set<String> readSqlStatements(String filePath) {
+        StringBuilder content = new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                String trimmedLine = line.trim();
+                if (!trimmedLine.isEmpty() && !trimmedLine.startsWith("--")) { // 忽略空行和注释
+                    content.append(trimmedLine).append(" "); // 以空格拼接，防止换行影响 SQL 语句完整性
+                }
+            }
+        } catch (IOException e) {
+            System.err.println("读取文件失败：" + filePath);
+            e.printStackTrace();
+        }
+
+        // 按 `;` 进行分割，并去重
+        return Arrays.stream(content.toString().split(";"))
+                .map(String::trim)
+                .filter(sql -> !sql.isEmpty())
+                .collect(Collectors.toSet());
+    }
+    /**
+     * 标准化 SQL 语句，移除多余的空格，换行符，大小写差异
+     */
+    private static String normalizeSql(String sql) {
+        return sql.replaceAll("\\s+", " ").trim().toLowerCase();
+    }
+}
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/MySQLExporterUtil.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/MySQLExporterUtil.java
index 18d32196..ac2aa137 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/MySQLExporterUtil.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/MySQLExporterUtil.java
@@ -29,11 +29,14 @@ public class MySQLExporterUtil {
         }
         try (Connection conn = DriverManager.getConnection(jdbcUrl, user, password);
              FileWriter writer = new FileWriter(outputFile)) {
-
+            // 连接数据库
             switchDatabase(conn);
+            // 导出表结构
             exportTables(conn, writer);
+            // 导出视图结构
             exportViews(conn, writer);
-
+            // 导出存储过程
+            exportProcedures(conn, writer);
             System.out.println("导出成功！文件路径: " + outputFile);
         } catch (Exception e) {
             e.printStackTrace();
@@ -119,5 +122,23 @@ public class MySQLExporterUtil {
         }
     }
 
+    private  void exportProcedures(Connection conn, FileWriter writer) throws SQLException, IOException {
+        DatabaseMetaData meta = conn.getMetaData();
+        try (ResultSet procedures = meta.getProcedures(databaseName, null, "%")) {
+            while (procedures.next()) {
+                String procedureName = procedures.getString("PROCEDURE_NAME");
+                writer.write(getCreateProcedureSQL(conn, procedureName) + ";\n\n");
+            }
+        }
+    }
 
+    private  String getCreateProcedureSQL(Connection conn, String procedureName) throws SQLException {
+        try (Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("SHOW CREATE PROCEDURE " + procedureName)) {
+            if (rs.next()) {
+                return rs.getString("Create Procedure");
+            }
+            return "";
+        }
+    }
 }
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/SqlFileProcessor.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/SqlFileProcessor.java
index 2ea14655..61206811 100644
--- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/SqlFileProcessor.java
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/controller/utils/Mysql/SqlFileProcessor.java
@@ -4,6 +4,10 @@ import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.MalformedInputException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -16,13 +20,38 @@ public class SqlFileProcessor {
 
     public static Map<String, List<String>> processSqlFile(String filePath) throws IOException {
         List<String> sqlStatements = readSQLFromFile(filePath);
+        //查找语句
         List<String> selectStatements = new ArrayList<>();
+        //删除语句
+        List<String> delStatements = new ArrayList<>();
+        //视图
+        List<String> viewStatements = new ArrayList<>();
+
+        //其他（建表，新增。修改）
         List<String> otherStatements = new ArrayList<>();
+        //触发器
+        List<String> triggerStatements = new ArrayList<>();
+
+        //存储过程
+        List<String> procedureStatements = new ArrayList<>();
 
         for (String sql : sqlStatements) {
             if (sql.trim().toUpperCase().startsWith("SELECT")) {
                 selectStatements.add(sql);
-            } else {
+            }else if ( sql.toUpperCase().contains("TRIGGER")) {
+                triggerStatements.add(sql);
+            }
+            else if ( sql.toUpperCase().contains("PROCEDURE")) {
+                procedureStatements.add(sql);
+            }
+            else if (sql.trim().toUpperCase().startsWith("DELETE")){
+                delStatements.add(sql);
+            }else if (sql.trim().replaceAll("\\s+", " ").matches("(?i)^CREATE( OR REPLACE)?( ALGORITHM\\s*=\\s*\\w+)?( DEFINER\\s*=\\s*[`\"'\\w@%\\.]+)?( SQL SECURITY \\w+)? VIEW\\b.*")) {
+                // 把视图语句加到 viewStatements 集合里
+                viewStatements.add(sql);
+            }
+            else
+            {
                 otherStatements.add(sql);
             }
         }
@@ -30,44 +59,61 @@ public class SqlFileProcessor {
         Map<String, List<String>> result = new HashMap<>();
         result.put("SELECT", selectStatements);
         result.put("OTHER", otherStatements);
-
+        result.put("TRIGGER", triggerStatements);
+        result.put("PROCEDURE", procedureStatements);
+        result.put("VIEW", viewStatements);
+        result.put("DELETE", delStatements);
         return result;
     }
 
     private static List<String> readSQLFromFile(String filePath) throws IOException {
-        List<String> sqlStatements = new ArrayList<>();
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), "UTF-8"))) {
-            StringBuilder sqlStatement = new StringBuilder();
-            String line;
-            boolean insideBlockComment = false;
 
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
 
-                if (line.contains("/*")) {
-                    insideBlockComment = true;
-                    line = line.split("/\\*")[0].trim();
-                }
-                if (line.contains("*/")) {
-                    insideBlockComment = false;
-                    line = line.split("\\*/")[1].trim();
-                }
+            List<String> lines = readFileAutoCharset(filePath);
+            List<String> sqlList = parseSql(lines);
 
-                if (line.startsWith("--") || line.isEmpty() || insideBlockComment) {
-                    continue;
-                }
-
-                sqlStatement.append(line).append(" ");
-                if (line.endsWith(";")) {
-                    sqlStatements.add(sqlStatement.toString().trim());
-                    sqlStatement.setLength(0);
-                }
+            for (String sql : sqlList) {
+                System.out.println(sql);
             }
 
-            if (sqlStatement.length() > 0) {
-                sqlStatements.add(sqlStatement.toString().trim());
-            }
+        return sqlList;
+    }
+    // 自动识别 UTF-8 or GBK
+    private static List<String> readFileAutoCharset(String filePath) throws IOException {
+        try {
+            // 优先尝试 UTF-8
+            return Files.readAllLines(Paths.get(filePath), Charset.forName("UTF-8"));
+        } catch (MalformedInputException e) {
+            // 如果UTF-8失败，再尝试GBK
+            System.out.println("文件不是UTF-8编码，尝试使用GBK编码读取...");
+            return Files.readAllLines(Paths.get(filePath), Charset.forName("GBK"));
         }
-        return sqlStatements;
+    }
+
+    // 解析SQL：去掉注释，只保留SQL语句
+    private static List<String> parseSql(List<String> lines) {
+        List<String> sqlList = new ArrayList<>();
+        StringBuilder currentSql = new StringBuilder();
+
+        for (String line : lines) {
+            line = line.trim();
+            if (line.startsWith("--")) {
+                // 遇到新的注释（比如 -- 1.），先把之前的SQL收进去
+                if (currentSql.length() > 0) {
+                    sqlList.add(currentSql.toString().trim());
+                    currentSql.setLength(0);
+                }
+                continue; // 注释行不用管
+            }
+
+            // 累加 SQL 内容
+            currentSql.append(line).append("\n");
+        }
+
+        if (currentSql.length() > 0) {
+            sqlList.add(currentSql.toString().trim());
+        }
+
+        return sqlList;
     }
 }
diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/domain/SqlExecutionResult.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/domain/SqlExecutionResult.java
new file mode 100644
index 00000000..d80dfe5c
--- /dev/null
+++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/domain/SqlExecutionResult.java
@@ -0,0 +1,39 @@
+package pc.exam.pp.module.judgement.domain;
+
+public class SqlExecutionResult {
+    private String sqlStatement;
+    private String backupFile;
+    private boolean isValid;
+
+    public SqlExecutionResult(String sqlStatement, String backupFile) {
+        this.sqlStatement = sqlStatement;
+        this.backupFile = backupFile;
+        this.isValid = false; // 默认执行完后再判断
+    }
+
+    public String getSqlStatement() {
+        return sqlStatement;
+    }
+
+    public String getBackupFile() {
+        return backupFile;
+    }
+
+    public boolean isValid() {
+        return isValid;
+    }
+
+    public void setValid(boolean valid) {
+        isValid = valid;
+    }
+
+    @Override
+    public String toString() {
+        return "SqlExecutionResult{" +
+                "sqlStatement='" + sqlStatement + '\'' +
+                ", backupFile='" + backupFile + '\'' +
+                ", isValid=" + isValid +
+                '}';
+    }
+}
+
diff --git a/exam-module-system/exam-module-system-api/src/main/java/pc/exam/pp/module/system/enums/ErrorCodeConstants.java b/exam-module-system/exam-module-system-api/src/main/java/pc/exam/pp/module/system/enums/ErrorCodeConstants.java
index 7094c5c5..99384d5b 100644
--- a/exam-module-system/exam-module-system-api/src/main/java/pc/exam/pp/module/system/enums/ErrorCodeConstants.java
+++ b/exam-module-system/exam-module-system-api/src/main/java/pc/exam/pp/module/system/enums/ErrorCodeConstants.java
@@ -183,4 +183,7 @@ public interface ErrorCodeConstants {
     ErrorCode WORD_PARENT_ERROR = new ErrorCode(1_002_030_004, "不能设置自己为父WORD节点");
     ErrorCode WORD_NOT_ENABLE = new ErrorCode(1_002_030_006, "WORD节点({})不处于开启状态，不允许选择");
     ErrorCode WORD_PARENT_IS_CHILD = new ErrorCode(1_002_030_007, "不能设置自己的子WORD节点为父WORD节点");
+
+
+    ErrorCode MONITOR_NOT_EXISTS = new ErrorCode(1_003_301_001, "id为空");
 }
diff --git a/exam-server/src/main/resources/application-dev.yaml b/exam-server/src/main/resources/application-dev.yaml
index 7cae1b11..d836ba30 100644
--- a/exam-server/src/main/resources/application-dev.yaml
+++ b/exam-server/src/main/resources/application-dev.yaml
@@ -44,14 +44,14 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://47.101.60.131:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          username: pc-exam
-          password: YGsyBWH3KdGpz8C7
+          url: jdbc:mysql://127.0.0.1:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          username: root
+          password: 123
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://47.101.60.131:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          username: pc-exam
-          password: YGsyBWH3KdGpz8C7
+          url: jdbc:mysql://127.0.0.1:3306/pc-exam?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          username: root
+          password: 123
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
diff --git a/exam-server/src/main/resources/application.yaml b/exam-server/src/main/resources/application.yaml
index 3099ff52..de7148c2 100644
--- a/exam-server/src/main/resources/application.yaml
+++ b/exam-server/src/main/resources/application.yaml
@@ -345,7 +345,6 @@ exam:
       - education_paper_qu
       - education_paper_scheme
       - education_paper_session
-      - exam_specialty
     ignore-caches:
       - user_role_ids
       - permission_menu_ids