From 4e20d11a95ca431322d8706057c29e4536dca2f6 Mon Sep 17 00:00:00 2001 From: dlaren Date: Mon, 4 Aug 2025 14:08:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?= =?UTF-8?q?=E8=AF=95=E9=A2=98=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E7=94=B1sys=5Ffile=E5=8F=98=E6=9B=B4=E4=B8=BAexam=5Fq?= =?UTF-8?q?uestion=5Ffile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exam/dal/dataobject/ExamQuestion.java | 3 +-- ...sFileUpload.java => ExamQuestionFile.java} | 6 ++--- ...apper.java => ExamQuestionFileMapper.java} | 18 ++++++------- .../paper/EducationPaperQuServiceImpl.java | 7 +++-- .../paper/EducationPaperServiceImpl.java | 9 +++---- .../paper/EducationPaperTaskServiceImpl.java | 6 ++--- .../question/ExamQuestionServiceImpl.java | 14 +++++----- .../mapper/exam/ExamQuestionAnswerMapper.xml | 2 +- ...eMapper.xml => ExamQuestionFileMapper.xml} | 26 +++++++++---------- .../src/main/resources/application.yaml | 2 +- 10 files changed, 44 insertions(+), 49 deletions(-) rename exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/{SysFileUpload.java => ExamQuestionFile.java} (87%) rename exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/{SysFileMapper.java => ExamQuestionFileMapper.java} (67%) rename exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/{SysFileMapper.xml => ExamQuestionFileMapper.xml} (79%) 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 cee21b43..aecc2a3c 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 @@ -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 fileUploads; + private List fileUploads; /** 试题判分 */ // @Excel(name = "试题判分") diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/SysFileUpload.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionFile.java similarity index 87% rename from exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/SysFileUpload.java rename to exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamQuestionFile.java index 335bfe6c..6c5cfb6b 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/SysFileUpload.java +++ b/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; /** 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/ExamQuestionFileMapper.java similarity index 67% rename from exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/SysFileMapper.java rename to exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/question/ExamQuestionFileMapper.java index 129ab7b3..629abc0b 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/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 selectSysFileList(SysFileUpload sysFileUpload); + public List 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 fileUploads); + public int insertSysFileList(List fileUploads); void deleteSysFileByQuesId(String firstQuId); void deleteSysFileByQuesIds(@Param("firstQuIds") String[] firstQuIds); - public List selectSysFileByQuid(String quId); + public List selectSysFileByQuid(String quId); - List selectSysFileByQuidIN(String quId); + List selectSysFileByQuidIN(String quId); } 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 6eb0e010..0125c229 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 @@ -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 sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); + List sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); examQuestion.setFileUploads(sysFileUploads); } } 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 91307aa1..8f48a12e 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 @@ -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 sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); + List sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); examQuestion.setFileUploads(sysFileUploads); } } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java index a2389e93..2ac8c6b2 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java @@ -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 sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); + List sysFileUploads =sysFileMapper.selectSysFileByQuidIN(examQuestion.getQuId()); examQuestion.setFileUploads(sysFileUploads); } } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java index 71aea70e..64c1fae2 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java @@ -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 examQuestionAnswers = examQuestionAnswerMapper.selectExamQuestionAnswerByQuId(quId); //查找试题文件 - List sysFileUploads = sysFileMapper.selectSysFileByQuid(quId); + List 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 answerList = examQuestion.getAnswerList(); - List fileUploads = examQuestion.getFileUploads(); + List fileUploads = examQuestion.getFileUploads(); ExamQuestionScore questionScore = examQuestion.getQuestionScores(); List examQuestionKeywords = examQuestion.getQuestionKeywords(); if (answerList != null && answerList.size() > 0) { @@ -220,7 +220,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService { public int updateExamQuestion(ExamQuestion examQuestion) { List answerList = examQuestion.getAnswerList(); - List fileUploads = examQuestion.getFileUploads(); + List fileUploads = examQuestion.getFileUploads(); ExamQuestionScore questionScore = examQuestion.getQuestionScores(); List examQuestionKeywords = examQuestion.getQuestionKeywords(); List excludedSubjects = Arrays.asList("程序设计", "网络题", "文件处理"); @@ -604,7 +604,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService { //新增 List answerList = examQuestion.getAnswerList(); - List fileUploads = examQuestion.getFileUploads(); + List fileUploads = examQuestion.getFileUploads(); ExamQuestionScore questionScores = examQuestion.getQuestionScores(); List questionKeywords = examQuestion.getQuestionKeywords(); @@ -658,7 +658,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService { //新增 List answerList = examQuestion.getAnswerList(); - List fileUploads = examQuestion.getFileUploads(); + List fileUploads = examQuestion.getFileUploads(); ExamQuestionScore questionScores = examQuestion.getQuestionScores(); List questionKeywords = examQuestion.getQuestionKeywords(); @@ -722,7 +722,7 @@ public class ExamQuestionServiceImpl implements IExamQuestionService { //查找试题答案 List examQuestionAnswers = examQuestionAnswerMapper.selectExamQuestionAnswerByQuId(quId); //查找试题文件 - List sysFileUploads = sysFileMapper.selectSysFileByQuid(quId); + List sysFileUploads = sysFileMapper.selectSysFileByQuid(quId); //查找试题判分 ExamQuestionScore examQuestionScore = examQuestionScoreMapper.selectExamQuestionScoreByQuId(quId); //获取试题关键字 diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionAnswerMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionAnswerMapper.xml index ac8ff6ca..1f5d0a09 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamQuestionAnswerMapper.xml +++ b/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} + - - insert into sys_file + + insert into exam_question_file file_id, qu_id, @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_file + insert into exam_question_file (file_id, qu_id,url,file_type,file_name) values @@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update sys_file + + update exam_question_file qu_id = #{quId}, url = #{url}, @@ -80,20 +80,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_file where file_id = #{fileId} + delete from exam_question_file where file_id = #{fileId} - delete from sys_file where file_id in + delete from exam_question_file where file_id in #{fileId} - delete from sys_file where qu_id = #{firstQuId} + delete from exam_question_file where qu_id = #{firstQuId} - delete from sys_file where qu_id in + delete from exam_question_file where qu_id in #{firstQuId} diff --git a/exam-server/src/main/resources/application.yaml b/exam-server/src/main/resources/application.yaml index 1d90c714..69dd1329 100644 --- a/exam-server/src/main/resources/application.yaml +++ b/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