From c858201e6557647351f75b6f351deafbd80cfe7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=BB=B4=E7=82=B3?= Date: Tue, 22 Apr 2025 11:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=A7=BB=E5=8A=A8=EF=BC=8C=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 21 +++++++++++-------- .../specialty/ExamSpecialtyController.java | 7 ++----- .../knowledge/ExamKnowledgePoints.java | 4 +--- .../dataobject/specialty/ExamSpecialty.java | 2 +- .../knowledge/ExamKnowledgePointsMapper.java | 4 ++-- .../mysql/specialty/ExamSpecialtyMapper.java | 5 ++--- .../knowledge/ExamKnowledgePointsService.java | 2 +- .../ExamKnowledgePointsServiceImpl.java | 8 +++---- .../specialty/ExamSpecialtyService.java | 2 +- .../specialty/ExamSpecialtyServiceImpl.java | 8 +++---- .../knowledge/ExamKnowledgePointsMapper.xml | 2 +- .../mapper/specialty/ExamSpecialtyMapper.xml | 2 +- 12 files changed, 32 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 3dbf3903..602b0983 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ .LSOverride Icon ._* - + # IDE - IntelliJ IDEA .idea/ *.iml @@ -12,14 +12,17 @@ Icon *.ipr out/ .idea_modules/ - + # IDE - VSCode .vscode/ *.code-workspace - + # Obsidian files .obsidian/ - + +# Java build directory +/target/ + # Compiled files *.class *.jar @@ -28,18 +31,18 @@ out/ *.zip *.tar.gz *.rar - + # Logs and databases *.log *.sqlite *.db - + # Node node_modules/ npm-debug.log* yarn-debug.log* yarn-error.log* - + # Python __pycache__/ *.py[cod] @@ -61,8 +64,8 @@ wheels/ *.egg-info/ .installed.cfg *.egg - + # Temporary files *.swp *.swo -*~ +*~ \ 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/specialty/ExamSpecialtyController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java index 41f0327d..6d0041eb 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/specialty/ExamSpecialtyController.java @@ -3,19 +3,16 @@ package pc.exam.pp.module.exam.controller.admin.specialty; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; 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.framework.common.util.object.BeanUtils; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; -import pc.exam.pp.module.exam.dal.dataobject.ExamSpecialty; +import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints; +import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; import pc.exam.pp.module.exam.service.knowledge.ExamKnowledgePointsService; import pc.exam.pp.module.exam.service.specialty.ExamSpecialtyService; -import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java index b552add9..accd6047 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java @@ -1,12 +1,10 @@ -package pc.exam.pp.module.exam.dal.dataobject; +package pc.exam.pp.module.exam.dal.dataobject.knowledge; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import pc.exam.pp.framework.tenant.core.db.TenantBaseDO; /** diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/specialty/ExamSpecialty.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/specialty/ExamSpecialty.java index 12d643cf..a18ec255 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/specialty/ExamSpecialty.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/specialty/ExamSpecialty.java @@ -1,4 +1,4 @@ -package pc.exam.pp.module.exam.dal.dataobject; +package pc.exam.pp.module.exam.dal.dataobject.specialty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/knowledge/ExamKnowledgePointsMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/knowledge/ExamKnowledgePointsMapper.java index 3430733e..4435f114 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/knowledge/ExamKnowledgePointsMapper.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/knowledge/ExamKnowledgePointsMapper.java @@ -1,9 +1,9 @@ -package pc.exam.pp.module.exam.dal.mysql; +package pc.exam.pp.module.exam.dal.mysql.knowledge; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; +import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints; import java.util.List; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java index 08232182..4c51a00b 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/specialty/ExamSpecialtyMapper.java @@ -1,10 +1,9 @@ -package pc.exam.pp.module.exam.dal.mysql; +package pc.exam.pp.module.exam.dal.mysql.specialty; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamSpecialty; +import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; import java.util.List; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsService.java index 747f4fbe..047d98eb 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsService.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsService.java @@ -1,6 +1,6 @@ package pc.exam.pp.module.exam.service.knowledge; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; +import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints; import java.util.List; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsServiceImpl.java index a2e82215..853aa617 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/knowledge/ExamKnowledgePointsServiceImpl.java @@ -2,10 +2,10 @@ package pc.exam.pp.module.exam.service.knowledge; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; -import pc.exam.pp.module.exam.dal.dataobject.ExamSpecialty; -import pc.exam.pp.module.exam.dal.mysql.ExamKnowledgePointsMapper; -import pc.exam.pp.module.exam.dal.mysql.ExamSpecialtyMapper; +import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints; +import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; +import pc.exam.pp.module.exam.dal.mysql.knowledge.ExamKnowledgePointsMapper; +import pc.exam.pp.module.exam.dal.mysql.specialty.ExamSpecialtyMapper; import java.util.List; import java.util.Objects; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java index 55072f9c..50c564a3 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyService.java @@ -2,7 +2,7 @@ package pc.exam.pp.module.exam.service.specialty; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamSpecialty; +import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; import java.util.List; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java index e9368f28..87154be1 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/specialty/ExamSpecialtyServiceImpl.java @@ -6,10 +6,10 @@ import org.springframework.stereotype.Service; import pc.exam.pp.framework.common.util.object.BeanUtils; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtListReqVo; import pc.exam.pp.module.exam.controller.admin.specialty.vo.SpecialtyQueryVo; -import pc.exam.pp.module.exam.dal.dataobject.ExamKnowledgePoints; -import pc.exam.pp.module.exam.dal.dataobject.ExamSpecialty; -import pc.exam.pp.module.exam.dal.mysql.ExamKnowledgePointsMapper; -import pc.exam.pp.module.exam.dal.mysql.ExamSpecialtyMapper; +import pc.exam.pp.module.exam.dal.dataobject.knowledge.ExamKnowledgePoints; +import pc.exam.pp.module.exam.dal.dataobject.specialty.ExamSpecialty; +import pc.exam.pp.module.exam.dal.mysql.knowledge.ExamKnowledgePointsMapper; +import pc.exam.pp.module.exam.dal.mysql.specialty.ExamSpecialtyMapper; import java.util.List; import java.util.Objects; diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml index 26e2bea3..4d22bc93 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml index 1128e98c..16b6c467 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/specialty/ExamSpecialtyMapper.xml @@ -2,7 +2,7 @@ - +