【修改】 试题相关文件库名由sys_file变更为exam_question_file

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestion.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO;
 import pc.exam.pp.framework.tenant.core.db.TenantBaseDO;
 
 import java.util.List;
@@ -110,7 +109,7 @@ public class ExamQuestion extends TenantBaseDO {
     /** 试题文件 */
     //  @Excel(name = "试题文件")
     @TableField(exist = false)
-    private List<SysFileUpload>  fileUploads;
+    private List<ExamQuestionFile>  fileUploads;
     
     /** 试题判分 */
     //    @Excel(name = "试题判分")

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionFile.java

@@ -9,16 +9,16 @@ import lombok.experimental.Accessors;
 import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO;
 
 /**
- * 文件(hyc)对象 sys_file
+ * 文件(hyc)对象
  * 
  * @author pengchen
  * @date 2025-03-18
  */
-@TableName(value = "sys_file", autoResultMap = true)
+@TableName(value = "exam_question_file", autoResultMap = true)
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class SysFileUpload extends BaseDO {
+public class ExamQuestionFile extends BaseDO {
     private static final long serialVersionUID = 1L;
 
     /**

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionFileMapper.java

@@ -2,7 +2,7 @@ package pc.exam.pp.module.exam.dal.mysql.question;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import pc.exam.pp.module.exam.dal.dataobject.SysFileUpload;
+import pc.exam.pp.module.exam.dal.dataobject.ExamQuestionFile;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2025-03-18
  */
 @Mapper
-public interface SysFileMapper 
+public interface ExamQuestionFileMapper
 {
     /**
      * 查询文件(hyc)
@@ -21,7 +21,7 @@ public interface SysFileMapper
      * @param fileId 文件(hyc)主键
      * @return 文件(hyc)
      */
-    public SysFileUpload selectSysFileByFileId(String fileId);
+    public ExamQuestionFile selectSysFileByFileId(String fileId);
 
     /**
      * 查询文件(hyc)列表
@@ -29,7 +29,7 @@ public interface SysFileMapper
      * @param sysFileUpload 文件(hyc)
      * @return 文件(hyc)集合
      */
-    public List<SysFileUpload> selectSysFileList(SysFileUpload sysFileUpload);
+    public List<ExamQuestionFile> selectSysFileList(ExamQuestionFile sysFileUpload);
 
     /**
      * 新增文件(hyc)
@@ -37,7 +37,7 @@ public interface SysFileMapper
      * @param sysFileUpload 文件(hyc)
      * @return 结果
      */
-    public int insertSysFile(SysFileUpload sysFileUpload);
+    public int insertSysFile(ExamQuestionFile sysFileUpload);
 
     /**
      * 修改文件(hyc)
@@ -45,7 +45,7 @@ public interface SysFileMapper
      * @param sysFileUpload 文件(hyc)
      * @return 结果
      */
-    public int updateSysFile(SysFileUpload sysFileUpload);
+    public int updateSysFile(ExamQuestionFile sysFileUpload);
 
     /**
      * 删除文件(hyc)
@@ -63,12 +63,12 @@ public interface SysFileMapper
      */
     public int deleteSysFileByFileIds(String[] fileIds);
 
-    public int insertSysFileList(List<SysFileUpload> fileUploads);
+    public int insertSysFileList(List<ExamQuestionFile> fileUploads);
     void deleteSysFileByQuesId(String  firstQuId);
     void deleteSysFileByQuesIds(@Param("firstQuIds") String[]  firstQuIds);
 
-    public List<SysFileUpload>  selectSysFileByQuid(String quId);
+    public List<ExamQuestionFile>  selectSysFileByQuid(String quId);
 
-    List<SysFileUpload> selectSysFileByQuidIN(String quId);
+    List<ExamQuestionFile> selectSysFileByQuidIN(String quId);
 
 }

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperQuServiceImpl.java

@@ -1,7 +1,6 @@
 package pc.exam.pp.module.exam.service.paper;
 
 import com.alibaba.excel.util.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import pc.exam.pp.framework.security.core.util.SecurityFrameworkUtils;
@@ -13,7 +12,7 @@ import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints;
 import pc.exam.pp.module.exam.dal.mysql.knowledge.ExamKnowledgePointsMapper;
 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.dal.mysql.question.SysFileMapper;
+import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionFileMapper;
 import pc.exam.pp.module.exam.service.question.IExamQuestionService;
 
 import java.util.ArrayList;
@@ -47,7 +46,7 @@ public class EducationPaperQuServiceImpl implements IEducationPaperQuService
     @Autowired
     private EducationPaperPersonMapper educationPaperPersonMapper;
     @Autowired
-    private SysFileMapper sysFileMapper;
+    private ExamQuestionFileMapper sysFileMapper;
     @Autowired
     private EducationPaperTaskMapper educationPaperTaskMapper;
     @Autowired
@@ -146,7 +145,7 @@ public class EducationPaperQuServiceImpl implements IEducationPaperQuService
 
                 for (ExamQuestion examQuestion : examQuestionList) {
                     //查找原始和素材试题文件
-                    List<SysFileUpload> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
+                    List<ExamQuestionFile> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
                     examQuestion.setFileUploads(sysFileUploads);
                 }
             }

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperServiceImpl.java

@@ -2,11 +2,9 @@ package pc.exam.pp.module.exam.service.paper;
 
 
 import cn.afterturn.easypoi.word.WordExportUtil;
-import com.alibaba.excel.util.StringUtils;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.*;
-import org.checkerframework.checker.units.qual.A;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -18,7 +16,6 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import pc.exam.pp.framework.common.pojo.PageResult;
 import pc.exam.pp.framework.security.core.util.SecurityFrameworkUtils;
 import pc.exam.pp.framework.tenant.core.aop.TenantIgnore;
@@ -32,7 +29,7 @@ import pc.exam.pp.module.exam.controller.admin.paper.vo.StuInfoPaper;
 import pc.exam.pp.module.exam.dal.dataobject.*;
 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.dal.mysql.question.SysFileMapper;
+import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionFileMapper;
 import pc.exam.pp.module.exam.utils.uuid.IdUtils;
 
 import java.io.*;
@@ -77,7 +74,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService
     @Autowired
     private ExamQuestionMapper examQuestionMapper;
     @Autowired
-    private SysFileMapper sysFileMapper;
+    private ExamQuestionFileMapper sysFileMapper;
     /**
      * 查询试卷
      *
@@ -481,7 +478,7 @@ public class EducationPaperServiceImpl implements IEducationPaperService
 
                 for (ExamQuestion examQuestion : examQuestionList) {
                     //查找原始和素材试题文件
-                    List<SysFileUpload> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
+                    List<ExamQuestionFile> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
                     examQuestion.setFileUploads(sysFileUploads);
                 }
             }

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java

@@ -20,7 +20,7 @@ import pc.exam.pp.module.exam.dal.dataobject.*;
 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.dal.mysql.question.SysFileMapper;
+import pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionFileMapper;
 import pc.exam.pp.module.exam.utils.date.DateUtils;
 import pc.exam.pp.module.exam.utils.uuid.IdUtils;
 
@@ -59,7 +59,7 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService
     private EducationPaperPersonMapper educationPaperPersonMapper;
 
     @Autowired
-    private SysFileMapper sysFileMapper;
+    private ExamQuestionFileMapper sysFileMapper;
     @Autowired
     private MonitorMapper monitorMapper;
 //@Autowired
@@ -524,7 +524,7 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService
                             .collect(Collectors.toList());
                     for (ExamQuestion examQuestion : examQuestionList) {
                         //查找原始和素材试题文件
-                        List<SysFileUpload> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
+                        List<ExamQuestionFile> sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId());
                         examQuestion.setFileUploads(sysFileUploads);
                     }
                 }

exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java

@@ -51,7 +51,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
     @Autowired
     private ExamQuestionAnswerMapper examQuestionAnswerMapper;
     @Autowired
-    private SysFileMapper sysFileMapper;
+    private ExamQuestionFileMapper sysFileMapper;
     @Autowired
     private ExamQuestionScoreMapper examQuestionScoreMapper;
     @Autowired
@@ -84,7 +84,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
         //查找试题答案
         List<ExamQuestionAnswer> examQuestionAnswers = examQuestionAnswerMapper.selectExamQuestionAnswerByQuId(quId);
         //查找试题文件
-        List<SysFileUpload> sysFileUploads = sysFileMapper.selectSysFileByQuid(quId);
+        List<ExamQuestionFile> sysFileUploads = sysFileMapper.selectSysFileByQuid(quId);
         //查找试题判分
         ExamQuestionScore examQuestionScore = examQuestionScoreMapper.selectExamQuestionScoreByQuId(quId);
         //获取试题关键字
@@ -141,7 +141,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
         examQuestion.setQuBankId(uuid);
         examQuestion.setCreateTime(DateUtils.getNowLocalDateTime());
         List<ExamQuestionAnswer> answerList = examQuestion.getAnswerList();
-        List<SysFileUpload> fileUploads = examQuestion.getFileUploads();
+        List<ExamQuestionFile> fileUploads = examQuestion.getFileUploads();
         ExamQuestionScore questionScore = examQuestion.getQuestionScores();
         List<ExamQuestionKeyword> examQuestionKeywords = examQuestion.getQuestionKeywords();
         if (answerList != null && answerList.size() > 0) {
@@ -220,7 +220,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
     public int updateExamQuestion(ExamQuestion examQuestion) {
 
         List<ExamQuestionAnswer> answerList = examQuestion.getAnswerList();
-        List<SysFileUpload> fileUploads = examQuestion.getFileUploads();
+        List<ExamQuestionFile> fileUploads = examQuestion.getFileUploads();
         ExamQuestionScore questionScore = examQuestion.getQuestionScores();
         List<ExamQuestionKeyword> examQuestionKeywords = examQuestion.getQuestionKeywords();
         List<String> excludedSubjects = Arrays.asList("程序设计", "网络题", "文件处理");
@@ -604,7 +604,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
 
                     //新增
                     List<ExamQuestionAnswer> answerList = examQuestion.getAnswerList();
-                    List<SysFileUpload> fileUploads = examQuestion.getFileUploads();
+                    List<ExamQuestionFile> fileUploads = examQuestion.getFileUploads();
                     ExamQuestionScore questionScores = examQuestion.getQuestionScores();
                     List<ExamQuestionKeyword> questionKeywords = examQuestion.getQuestionKeywords();
 
@@ -658,7 +658,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
 
                     //新增
                     List<ExamQuestionAnswer> answerList = examQuestion.getAnswerList();
-                    List<SysFileUpload> fileUploads = examQuestion.getFileUploads();
+                    List<ExamQuestionFile> fileUploads = examQuestion.getFileUploads();
                     ExamQuestionScore questionScores = examQuestion.getQuestionScores();
                     List<ExamQuestionKeyword> questionKeywords = examQuestion.getQuestionKeywords();
 
@@ -722,7 +722,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService {
                 //查找试题答案
                 List<ExamQuestionAnswer> examQuestionAnswers = examQuestionAnswerMapper.selectExamQuestionAnswerByQuId(quId);
                 //查找试题文件
-                List<SysFileUpload> sysFileUploads = sysFileMapper.selectSysFileByQuid(quId);
+                List<ExamQuestionFile> sysFileUploads = sysFileMapper.selectSysFileByQuid(quId);
                 //查找试题判分
                 ExamQuestionScore examQuestionScore = examQuestionScoreMapper.selectExamQuestionScoreByQuId(quId);
                 //获取试题关键字

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

@@ -94,7 +94,7 @@
         select  answer_id from exam_question_answer  where qu_id =#{quId}
     </select>
     <select id="selectAnswerFile" resultType="java.lang.String">
-        select url from sys_file where  qu_id =#{quId} and file_type ='2'
+        select url from exam_question_file where  qu_id =#{quId} and file_type ='2'
     </select>
     <select id="selectCountPointByQuId" resultType="java.lang.String">
         SELECT SUM(score_rate) AS totalKeyScore

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="pc.exam.pp.module.exam.dal.mysql.question.SysFileMapper">
+<mapper namespace="pc.exam.pp.module.exam.dal.mysql.question.ExamQuestionFileMapper">
     
-    <resultMap type="SysFileUpload" id="SysFileResult">
+    <resultMap type="ExamQuestionFile" id="SysFileResult">
         <result property="fileId"    column="file_id"    />
         <result property="quId"    column="qu_id"    />
         <result property="url"    column="url"    />
@@ -14,10 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysFileVo">
-        select file_id, qu_id,  url, file_type ,file_name from sys_file
+        select file_id, qu_id,  url, file_type ,file_name from exam_question_file
     </sql>
 
-    <select id="selectSysFileList" parameterType="SysFileUpload" resultMap="SysFileResult">
+    <select id="selectSysFileList" parameterType="ExamQuestionFile" resultMap="SysFileResult">
         <include refid="selectSysFileVo"/>
         <where>  
             <if test="quId != null "> and qu_id = #{quId}</if>
@@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <insert id="insertSysFile" parameterType="SysFileUpload">
+    <insert id="insertSysFile" parameterType="ExamQuestionFile">
-        insert into sys_file
+        insert into exam_question_file
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fileId != null">file_id,</if>
             <if test="quId != null">qu_id,</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
     <insert id="insertSysFileList">
-        insert into sys_file
+        insert into exam_question_file
         (file_id, qu_id,url,file_type,file_name)
         values
         <foreach collection="collection" separator="," item="item">
@@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-    <update id="updateSysFile" parameterType="SysFileUpload">
+    <update id="updateSysFile" parameterType="ExamQuestionFile">
-        update sys_file
+        update exam_question_file
         <trim prefix="SET" suffixOverrides=",">
             <if test="quId != null">qu_id = #{quId},</if>
             <if test="url != null">url = #{url},</if>
@@ -80,20 +80,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSysFileByFileId" parameterType="String">
-        delete from sys_file where file_id = #{fileId}
+        delete from exam_question_file where file_id = #{fileId}
     </delete>
 
     <delete id="deleteSysFileByFileIds" parameterType="String">
-        delete from sys_file where file_id in 
+        delete from exam_question_file where file_id in
         <foreach item="fileId" collection="array" open="(" separator="," close=")">
             #{fileId}
         </foreach>
     </delete>
     <delete id="deleteSysFileByQuesId">
-        delete from sys_file where qu_id = #{firstQuId}
+        delete from exam_question_file where qu_id = #{firstQuId}
     </delete>
     <delete id="deleteSysFileByQuesIds">
-        delete from sys_file where qu_id in
+        delete from exam_question_file where qu_id in
         <foreach collection="firstQuIds" item="firstQuId" open="(" separator="," close=")">
             #{firstQuId}
         </foreach>

exam-server/src/main/resources/application.yaml

@@ -346,7 +346,7 @@ exam:
       - exam_question_answer
       - exam_question_keyword
       - exam_question_score
-      - sys_file
+      - exam_question_file
       - education_paper_param
       - education_paper_person
       - education_paper_qu