From a25c2e30cfdc09e78d9849dd63c52e3166557845 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 24 Nov 2022 14:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=8B=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/console/dao/AuditConsoleDao.java | 6 +++--- .../admin/console/dao/DictConsoleDao.java | 6 +++--- .../admin/console/dao/FunctionConsoleDao.java | 6 +++--- .../admin/console/dao/MenuConsoleDao.java | 6 +++--- .../admin/console/dao/OrgConsoleDao.java | 6 +++--- .../admin/console/dao/RoleConsoleDao.java | 6 +++--- .../console/dao/RoleFunctionConsoleDao.java | 6 +++--- .../admin/console/dao/UserConsoleDao.java | 5 +++-- .../ibeetl/admin/core/dao/CoreAuditDao.java | 6 +++--- .../com/ibeetl/admin/core/dao/CoreDictDao.java | 6 +++--- .../ibeetl/admin/core/dao/CoreFunctionDao.java | 6 +++--- .../com/ibeetl/admin/core/dao/CoreMenuDao.java | 6 +++--- .../com/ibeetl/admin/core/dao/CoreOrgDao.java | 6 +++--- .../com/ibeetl/admin/core/dao/CoreRoleDao.java | 6 +++--- .../admin/core/dao/CoreRoleFunctionDao.java | 6 +++--- .../ibeetl/admin/core/dao/CoreRoleMenuDao.java | 6 +++--- .../com/ibeetl/admin/core/dao/CoreUserDao.java | 6 +++--- .../ibeetl/admin/core/dao/CoreUserRoleDao.java | 6 +++--- .../ibeetl/admin/core/dao/CoreWorkflowDao.java | 6 +++--- .../main/resources/codeTemplate/java/dao.java | 7 ++++--- .../java/com/ibeetl/jlw/dao/AttributeDao.java | 6 +++--- .../ibeetl/jlw/dao/AttributeGroupingDao.java | 6 +++--- .../ibeetl/jlw/dao/AttributeRelationDao.java | 6 +++--- .../com/ibeetl/jlw/dao/CompetitionDao.java | 6 +++--- .../com/ibeetl/jlw/dao/CompetitionNewsDao.java | 6 +++--- .../ibeetl/jlw/dao/CompetitionStudentsDao.java | 6 +++--- .../ibeetl/jlw/dao/CompetitionTaskMainDao.java | 6 +++--- .../jlw/dao/CompetitionTaskOneQuestionDao.java | 6 +++--- .../dao/CompetitionTaskSecondQuestionDao.java | 6 +++--- .../CompetitionTaskSecondQuestionStepDao.java | 6 +++--- .../dao/CompetitionTeacherEvaluationDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/CoreUserWxDao.java | 18 ++++++++---------- .../java/com/ibeetl/jlw/dao/CourseInfoDao.java | 6 +++--- .../com/ibeetl/jlw/dao/CourseLabelDao.java | 6 +++--- .../main/java/com/ibeetl/jlw/dao/ExamDao.java | 6 +++--- .../com/ibeetl/jlw/dao/ExamStudentsDao.java | 6 +++--- .../ibeetl/jlw/dao/ExamTaskOneQuestionDao.java | 6 +++--- .../jlw/dao/ExamTaskSecondQuestionDao.java | 6 +++--- .../jlw/dao/ExamTaskSecondQuestionStepDao.java | 6 +++--- .../jlw/dao/ExamTaskThreeQuestionDao.java | 6 +++--- .../jlw/dao/ExamTaskThreeQuestionStepDao.java | 6 +++--- .../ibeetl/jlw/dao/HandsOnAchievementDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/HandsOnDao.java | 6 +++--- .../HandsOnSimulationTasksAssessmentDao.java | 18 ++++++++---------- .../jlw/dao/HandsOnSimulationTasksDao.java | 6 +++--- .../jlw/dao/HandsOnSimulationTasksFileDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/IpAddressDao.java | 6 +++--- .../jlw/dao/ResourcesApplicationCourseDao.java | 6 +++--- .../jlw/dao/ResourcesApplicationDao.java | 6 +++--- .../jlw/dao/ResourcesCompetitionDao.java | 6 +++--- .../jlw/dao/ResourcesCompetitionStepDao.java | 6 +++--- .../com/ibeetl/jlw/dao/ResourcesInfoDao.java | 6 +++--- .../ibeetl/jlw/dao/ResourcesQuestionDao.java | 6 +++--- .../jlw/dao/ResourcesQuestionSnapshotDao.java | 6 +++--- .../ibeetl/jlw/dao/ResourcesTrainingDao.java | 6 +++--- .../jlw/dao/ResourcesTrainingStepDao.java | 6 +++--- .../com/ibeetl/jlw/dao/SchoolClassDao.java | 6 +++--- .../ibeetl/jlw/dao/StatisticalAnalysisDao.java | 6 +++--- .../ibeetl/jlw/dao/StudentClientLinkDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/StudentDao.java | 6 +++--- .../ibeetl/jlw/dao/StudentDefenceLogDao.java | 6 +++--- .../jlw/dao/StudentDefenceLogInfoDao.java | 6 +++--- .../jlw/dao/StudentDefenceLogNoteDao.java | 6 +++--- .../jlw/dao/StudentDirectMessagesDao.java | 6 +++--- .../jlw/dao/StudentHandsOnTaskPptDao.java | 6 +++--- .../jlw/dao/StudentHandsOnTaskReportDao.java | 6 +++--- .../jlw/dao/StudentHandsOnTaskStepDao.java | 6 +++--- .../jlw/dao/StudentHandsOnTaskTheoryDao.java | 6 +++--- .../jlw/dao/StudentHandsOnTaskVideoDao.java | 6 +++--- .../jlw/dao/StudentMergeApplicationDao.java | 6 +++--- .../jlw/dao/StudentQuestionLogAnswerDao.java | 6 +++--- .../ibeetl/jlw/dao/StudentQuestionLogDao.java | 6 +++--- .../jlw/dao/StudentQuestionLogInfoDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/SysLogDao.java | 6 +++--- .../java/com/ibeetl/jlw/dao/TeacherDao.java | 6 +++--- .../jlw/dao/TeacherMergeApplicationDao.java | 6 +++--- .../jlw/dao/TeacherOpenCourseChatLogDao.java | 6 +++--- .../ibeetl/jlw/dao/TeacherOpenCourseDao.java | 6 +++--- .../jlw/dao/TeacherOpenCourseHandsOnDao.java | 7 +++---- ...rseHandsOnSimulationTasksAssessmentDao.java | 18 ++++++++---------- ...herOpenCourseHandsOnSimulationTasksDao.java | 6 +++--- ...penCourseHandsOnSimulationTasksFileDao.java | 6 +++--- .../TeacherOpenCourseKnowledgePointDao.java | 6 +++--- ...herOpenCourseKnowledgePointRelationDao.java | 6 +++--- .../TeacherOpenCourseMergeCourseInfoDao.java | 6 +++--- ...TeacherOpenCourseMergeResourcesInfoDao.java | 6 +++--- ...herOpenCourseMergeResourcesQuestionDao.java | 2 +- ...acherOpenCourseMergeScheduleSessionDao.java | 6 +++--- .../TeacherOpenCourseMergeSchoolClassDao.java | 6 +++--- .../dao/TeacherOpenCourseMergeStudentDao.java | 6 +++--- .../dao/TeacherOpenCourseMergeTeacherDao.java | 6 +++--- .../jlw/dao/TeacherOpenCourseNoticeDao.java | 6 +++--- .../dao/TeacherOpenCourseQuestionLogDao.java | 6 +++--- .../TeacherOpenCourseQuestionLogWrongDao.java | 6 +++--- .../TeacherOpenCourseQuestionSettingDao.java | 6 +++--- ...acherOpenCourseScheduleSessionClassDao.java | 6 +++--- .../TeacherOpenCourseScheduleSessionDao.java | 6 +++--- ...eacherOpenCourseScheduleSessionSnapDao.java | 6 +++--- ...TeacherOpenCourseScheduleSessionTagDao.java | 6 +++--- .../TeacherOpenCourseScoreDashboardDao.java | 6 +++--- .../dao/TeacherOpenCourseScoreWeightDao.java | 6 +++--- .../TeacherOpenCourseStudentSigninLogDao.java | 6 +++--- ...acherOpenCourseStudentSigninSettingDao.java | 5 +++-- .../jlw/dao/UniversitiesCollegesDao.java | 5 +++-- ...egesJurisdictionCurriculumResourcesDao.java | 5 +++-- ...legesJurisdictionExperimentalSystemDao.java | 5 +++-- .../ibeetl/jlw/dao/UniversityFacultyDao.java | 5 +++-- .../ibeetl/jlw/dao/UniversitySystemDao.java | 5 +++-- .../com/ibeetl/jlw/dao/WrongQuestionDao.java | 6 +++--- ...penCourseMergeResourcesQuestionService.java | 3 +-- 110 files changed, 342 insertions(+), 342 deletions(-) diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/AuditConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/AuditConsoleDao.java index 6519e19c..26e424cd 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/AuditConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/AuditConsoleDao.java @@ -4,10 +4,10 @@ import com.ibeetl.admin.core.entity.CoreAudit; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.audit") public interface AuditConsoleDao extends BaseMapper { diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java index 638f7779..c055bf0e 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java @@ -5,15 +5,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * CoreDict Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.dict") public interface DictConsoleDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java index 5a466b04..5c6ef8e0 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java @@ -4,10 +4,10 @@ import com.ibeetl.admin.core.entity.CoreFunction; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.function") public interface FunctionConsoleDao extends BaseMapper { diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java index 8fd65dfc..ce7ed3f9 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java @@ -4,10 +4,10 @@ import com.ibeetl.admin.core.entity.CoreMenu; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.menu") public interface MenuConsoleDao extends BaseMapper { diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java index dd266915..3d851c9c 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java @@ -7,12 +7,12 @@ import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.org") public interface OrgConsoleDao extends BaseMapper { void queryByCondition(PageQuery query); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java index 1f692407..166e1fc8 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java @@ -6,12 +6,12 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.role") public interface RoleConsoleDao extends BaseMapper { diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java index b1b98a28..5323aef7 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java @@ -5,12 +5,12 @@ import com.ibeetl.admin.core.entity.CoreRoleFunction; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.roleFunction") public interface RoleFunctionConsoleDao extends BaseMapper { diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java index eb7e66bd..9b9e19f0 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java @@ -6,13 +6,14 @@ import com.ibeetl.admin.core.util.enums.GeneralStateEnum; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("console.user") public interface UserConsoleDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java index 451776cb..0e301a68 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java @@ -3,14 +3,14 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreAudit; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /* * * gen by starter mapper 2017-08-01 */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreAudit") public interface CoreAuditDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index a87166f5..a8c36905 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -4,7 +4,7 @@ import com.ibeetl.admin.core.entity.CoreDict; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -12,8 +12,8 @@ import java.util.Map; /** * 字典DAO接口 */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreDict") public interface CoreDictDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java index d154d7a7..d6ecf63b 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java @@ -5,10 +5,10 @@ import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.Sql; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreFunction") public interface CoreFunctionDao extends BaseMapper { @Sql("select * from core_function where code = ?") diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java index add258a5..abf21f3a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java @@ -5,12 +5,12 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreMenu") public interface CoreMenuDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java index 8659d650..73f14c9c 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java @@ -4,12 +4,12 @@ import com.ibeetl.admin.core.entity.CoreOrg; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Sql; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreOrg") public interface CoreOrgDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java index 0d6159c7..c34d9a63 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java @@ -3,10 +3,10 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreRole; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreRole") public interface CoreRoleDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java index d0158712..c3354c45 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java @@ -3,12 +3,12 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreRoleFunction; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreRoleFunction") public interface CoreRoleFunctionDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java index e2e3c01e..6ad648f6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java @@ -4,12 +4,12 @@ import com.ibeetl.admin.core.entity.CoreRoleMenu; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreRoleMenu") public interface CoreRoleMenuDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 388ca80c..95dc26ac 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -3,12 +3,12 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUser; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coreUser") public interface CoreUserDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java index 6cd40860..fff051d4 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java @@ -3,10 +3,10 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUserRole; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.coresUserRole") public interface CoreUserRoleDao extends BaseMapper { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java index c3eb81bd..9ec12061 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java @@ -3,7 +3,7 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreUser; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * 业务侧工作流的基本功能，工作流的一些功能将在业务侧完成，比如选人操作 * @author TLT */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("core.workflow") public interface CoreWorkflowDao extends BaseMapper { diff --git a/admin-core/src/main/resources/codeTemplate/java/dao.java b/admin-core/src/main/resources/codeTemplate/java/dao.java index ad9365a0..e80575f6 100644 --- a/admin-core/src/main/resources/codeTemplate/java/dao.java +++ b/admin-core/src/main/resources/codeTemplate/java/dao.java @@ -7,6 +7,7 @@ import ${basePackage}.entity.*; import ${basePackage}.web.query.${entity.name}Query; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.springframework.stereotype.Component; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; @@ -15,9 +16,9 @@ import org.beetl.sql.mapper.annotation.Update; /** * ${entity.displayName} Dao */ -\// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component -@SqlResource("${entity.system}.${entity.code}") +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +\@Repository +\@SqlResource("${entity.system}.${entity.code}") public interface ${entity.name}Dao extends BaseMapper<${entity.name}>{ PageQuery<${entity.name}> queryByCondition(PageQuery query); PageQuery<${entity.name}> queryByConditionQuery(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java index 86dd09c2..d90c44ef 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * Attribute Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.attribute") public interface AttributeDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java index d5b6015b..76859d8c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * AttributeGrouping Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.attributeGrouping") public interface AttributeGroupingDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java index 1eec13f0..0ea297f6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * AttributeRelation Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.attributeRelation") public interface AttributeRelationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java index b8c952dc..3144b129 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * Competition Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competition") public interface CompetitionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java index 5adf360b..cf458941 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * CompetitionNews Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionNews") public interface CompetitionNewsDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java index 9000d345..fe1f02ad 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * CompetitionStudents Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionStudents") public interface CompetitionStudentsDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskMainDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskMainDao.java index 308edff6..252231ab 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskMainDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskMainDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 大赛任务 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionTaskMain") public interface CompetitionTaskMainDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java index 07ad2daf..ce3b4358 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.math.BigDecimal; import java.util.List; @@ -15,8 +15,8 @@ import java.util.List; /** * CompetitionTaskOneQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionTaskOneQuestion") public interface CompetitionTaskOneQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java index e56e8941..8264e5d9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * CompetitionTaskSecondQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionTaskSecondQuestion") public interface CompetitionTaskSecondQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java index b4d795ea..93584ab9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * CompetitionTaskSecondQuestionStep Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionTaskSecondQuestionStep") public interface CompetitionTaskSecondQuestionStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java index d776bb37..30f1e19f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * CompetitionTeacherEvaluation Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.competitionTeacherEvaluation") public interface CompetitionTeacherEvaluationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CoreUserWxDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CoreUserWxDao.java index fb95e443..00f2c8b7 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CoreUserWxDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CoreUserWxDao.java @@ -1,22 +1,20 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.CoreUserWx; import com.ibeetl.jlw.web.query.CoreUserWxQuery; - -import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; -import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * CoreUserWx Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.coreUserWx") public interface CoreUserWxDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java index 3465f7f8..95693f6f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * CourseInfo Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.courseInfo") public interface CourseInfoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java b/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java index 7fd74ba6..ab0f218c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * CourseLabel Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.courseLabel") public interface CourseLabelDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java index 224627cd..34110c14 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * Exam Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.exam") public interface ExamDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java index 39af8593..12eb4fcb 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ExamStudents Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examStudents") public interface ExamStudentsDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java index c8aef874..1d91bb77 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.math.BigDecimal; import java.util.List; @@ -15,8 +15,8 @@ import java.util.List; /** * ExamTaskOneQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examTaskOneQuestion") public interface ExamTaskOneQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java index 65fea303..37e820a5 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ExamTaskSecondQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examTaskSecondQuestion") public interface ExamTaskSecondQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java index 7e7c6d8b..80af3290 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ExamTaskSecondQuestionStep Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examTaskSecondQuestionStep") public interface ExamTaskSecondQuestionStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java index 5f506d5f..738ba4d0 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ExamTaskThreeQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examTaskThreeQuestion") public interface ExamTaskThreeQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java index 989aec20..e94cb41d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ExamTaskThreeQuestionStep Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.examTaskThreeQuestionStep") public interface ExamTaskThreeQuestionStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnAchievementDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnAchievementDao.java index 4c23e394..137d8878 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnAchievementDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnAchievementDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 课程实操 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.handsOnAchievement") public interface HandsOnAchievementDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnDao.java index d4c2b306..91dfff8c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * HandsOn Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.handsOn") public interface HandsOnDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksAssessmentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksAssessmentDao.java index 9d0b5c82..3352e564 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksAssessmentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksAssessmentDao.java @@ -1,22 +1,20 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.HandsOnSimulationTasksAssessment; import com.ibeetl.jlw.web.query.HandsOnSimulationTasksAssessmentQuery; - -import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; -import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 课程实操-实训任务考核题目 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.handsOnSimulationTasksAssessment") public interface HandsOnSimulationTasksAssessmentDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java index 878461ed..1f86dc40 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * HandsOnSimulationTasks Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.handsOnSimulationTasks") public interface HandsOnSimulationTasksDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksFileDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksFileDao.java index 92c2c154..ed4be82a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksFileDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksFileDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 课程实操-任务附件 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.handsOnSimulationTasksFile") public interface HandsOnSimulationTasksFileDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java b/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java index fd7f5d6c..77133614 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * IpAddress Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.ipAddress") public interface IpAddressDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java index 4bae2979..586f0abf 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 课程绑定2 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesApplicationCourse") public interface ResourcesApplicationCourseDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java index 4c12fce1..8eeeb519 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * ResourcesApplication Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesApplication") public interface ResourcesApplicationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java index 35b6764c..09135740 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java @@ -10,7 +10,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -18,8 +18,8 @@ import java.util.List; /** * ResourcesCompetition Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesCompetition") public interface ResourcesCompetitionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java index d7d6e8bb..888213ce 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java @@ -5,7 +5,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -13,8 +13,8 @@ import java.util.List; /** * ResourcesCompetitionStep Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesCompetitionStep") public interface ResourcesCompetitionStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java index 39326b4b..9d20578f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ResourcesInfo Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesInfo") public interface ResourcesInfoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java index d06ed02c..e9f8d202 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java @@ -8,7 +8,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -16,8 +16,8 @@ import java.util.List; /** * ResourcesQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesQuestion") public interface ResourcesQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java index 6cd25c84..0980853e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionSnapshotDao.java @@ -8,15 +8,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 题目快照 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesQuestionSnapshot") public interface ResourcesQuestionSnapshotDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java index e7af5faa..1a2bdb7a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java @@ -9,7 +9,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -17,8 +17,8 @@ import java.util.List; /** * ResourcesTraining Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesTraining") public interface ResourcesTrainingDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java index 605f2646..83f4753c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * ResourcesTrainingStep Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.resourcesTrainingStep") public interface ResourcesTrainingStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java index 8e80ebb6..938d4524 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * SchoolClass Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.schoolClass") public interface SchoolClassDao extends BaseMapper { PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StatisticalAnalysisDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StatisticalAnalysisDao.java index 87fb8447..35c6208d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StatisticalAnalysisDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StatisticalAnalysisDao.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.dao; import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.Date; import java.util.Map; @@ -13,8 +13,8 @@ import java.util.Map; * @Author 许良彤 * @Date 2022/10/24 20:38 */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.statisticalAnalysis") public interface StatisticalAnalysisDao { diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java index 93f60ce9..754585c6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * StudentClientLink Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentClientLink") public interface StudentClientLinkDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java index 9a03da5c..17fdaa21 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -10,7 +10,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -19,8 +19,8 @@ import java.util.Map; /** * Student Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.student") public interface StudentDao extends BaseMapper{ PageQuery queryByConditionQuery(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java index 9fa7660c..410d750e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * StudentDefenceLog Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentDefenceLog") public interface StudentDefenceLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java index a7f81a3a..67a529bf 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * StudentDefenceLogInfo Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentDefenceLogInfo") public interface StudentDefenceLogInfoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java index 9549c3b7..9769d29c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * StudentDefenceLogNote Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentDefenceLogNote") public interface StudentDefenceLogNoteDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java index e9d448a1..dec2b893 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * StudentDirectMessages Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentDirectMessages") public interface StudentDirectMessagesDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskPptDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskPptDao.java index a67a6e6d..0e15032e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskPptDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskPptDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 学生-课程实操ppt Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentHandsOnTaskPpt") public interface StudentHandsOnTaskPptDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java index 0be2b0a2..6f8f0e55 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskReportDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 学生-课程实操-报告撰写 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentHandsOnTaskReport") public interface StudentHandsOnTaskReportDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskStepDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskStepDao.java index 5a232ae2..df664fa2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskStepDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 学生-课程实操实训操作步骤 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentHandsOnTaskStep") public interface StudentHandsOnTaskStepDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskTheoryDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskTheoryDao.java index d3c08e40..cb75448d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskTheoryDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskTheoryDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 学生-课程实操理论 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentHandsOnTaskTheory") public interface StudentHandsOnTaskTheoryDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskVideoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskVideoDao.java index c14c0ba4..e39a0bde 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskVideoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentHandsOnTaskVideoDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 学生-课程实操视频 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentHandsOnTaskVideo") public interface StudentHandsOnTaskVideoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java index 8202d7c5..b31e91d9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentMergeApplicationDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 学生关联应用-排序 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentMergeApplication") public interface StudentMergeApplicationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java index 3f711044..70a3fe09 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * StudentQuestionLogAnswer Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentQuestionLogAnswer") public interface StudentQuestionLogAnswerDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java index d2109175..addec3a2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * StudentQuestionLog Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentQuestionLog") public interface StudentQuestionLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java index 969932eb..0af29f91 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java @@ -5,14 +5,14 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; /** * StudentQuestionLogInfo Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.studentQuestionLogInfo") public interface StudentQuestionLogInfoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java index a12955d5..b116cd04 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java @@ -5,7 +5,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.Date; import java.util.List; @@ -15,8 +15,8 @@ import java.util.Map; /** * SysLog Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.sysLog") public interface SysLogDao extends BaseMapper { PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index dbe96b8f..1f8c0ba9 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -16,8 +16,8 @@ import java.util.Map; /** * Teacher Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacher") public interface TeacherDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java index 2fb3dcd7..f7555693 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.List; @@ -15,8 +15,8 @@ import java.util.List; /** * 教师关联应用 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherMergeApplication") public interface TeacherMergeApplicationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java index 959dfee2..4d64ccf7 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseChatLogDao.java @@ -7,15 +7,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 开课互动 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseChatLog") public interface TeacherOpenCourseChatLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java index 4195bf88..63973463 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -15,8 +15,8 @@ import java.util.List; /** * TeacherOpenCourse Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourse") public interface TeacherOpenCourseDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java index fb7808aa..0b213e3d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnDao.java @@ -2,13 +2,12 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnList; -import com.ibeetl.jlw.web.query.GetHandsOnListParam; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -16,8 +15,8 @@ import java.util.Map; /** * 教师开课-课程实操 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseHandsOn") public interface TeacherOpenCourseHandsOnDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksAssessmentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksAssessmentDao.java index 6931b623..c4778040 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksAssessmentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksAssessmentDao.java @@ -1,22 +1,20 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksAssessment; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksAssessmentQuery; - -import org.beetl.sql.mapper.annotation.SqlResource; -import org.springframework.stereotype.Component; -import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * 教师开课-课程实操-实训任务考核题目 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseHandsOnSimulationTasksAssessment") public interface TeacherOpenCourseHandsOnSimulationTasksAssessmentDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksDao.java index 809cd528..3f384690 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 教师开课-课程实操任务 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseHandsOnSimulationTasks") public interface TeacherOpenCourseHandsOnSimulationTasksDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksFileDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksFileDao.java index 291b870d..b561039a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksFileDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseHandsOnSimulationTasksFileDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 教师开课-课程实操任务附件 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseHandsOnSimulationTasksFile") public interface TeacherOpenCourseHandsOnSimulationTasksFileDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointDao.java index c192ca74..eb4a4aeb 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 知识点 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseKnowledgePoint") public interface TeacherOpenCourseKnowledgePointDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointRelationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointRelationDao.java index 56b96f11..98cef134 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointRelationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseKnowledgePointRelationDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 知识点关联 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseKnowledgePointRelation") public interface TeacherOpenCourseKnowledgePointRelationDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java index 592d1ffe..19d7a123 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java @@ -9,7 +9,7 @@ import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.List; @@ -18,8 +18,8 @@ import java.util.Map; /** * 开课课程拉取 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeCourseInfo") public interface TeacherOpenCourseMergeCourseInfoDao extends BaseMapper{ diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java index cc1641f9..5869a0bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 开课资源拉取 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeResourcesInfo") public interface TeacherOpenCourseMergeResourcesInfoDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesQuestionDao.java index df6dbb7d..87801c6c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesQuestionDao.java @@ -18,7 +18,7 @@ import java.util.Map; /** * 开课题目拉取 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 @Component @Validated @SqlResource("jlw.teacherOpenCourseMergeResourcesQuestion") diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java index 44f9fac6..94f3bed6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeScheduleSessionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.List; @@ -15,8 +15,8 @@ import java.util.Map; /** * 开课关联排课配置 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeScheduleSession") public interface TeacherOpenCourseMergeScheduleSessionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java index 636c0eb0..61bb54dd 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeSchoolClassDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 开课关联班级 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeSchoolClass") public interface TeacherOpenCourseMergeSchoolClassDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java index 5fc29712..bc862408 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java @@ -8,7 +8,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.List; @@ -16,8 +16,8 @@ import java.util.List; /** * 开课关联学生 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeStudent") public interface TeacherOpenCourseMergeStudentDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java index 67f1b4e2..1a91c8e3 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.List; @@ -16,8 +16,8 @@ import java.util.List; /** * 课程开课关联教师 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseMergeTeacher") public interface TeacherOpenCourseMergeTeacherDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseNoticeDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseNoticeDao.java index 31f9c276..33c1bb87 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseNoticeDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseNoticeDao.java @@ -7,15 +7,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 通知公告 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseNotice") public interface TeacherOpenCourseNoticeDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java index fede0dc8..99b824a1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 题目日志 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseQuestionLog") public interface TeacherOpenCourseQuestionLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogWrongDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogWrongDao.java index c956a13b..25f576be 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogWrongDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionLogWrongDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 错题集 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseQuestionLogWrong") public interface TeacherOpenCourseQuestionLogWrongDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java index cf1f7c2e..7e4eada6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseQuestionSettingDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 题目配置 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseQuestionSetting") public interface TeacherOpenCourseQuestionSettingDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java index 0264cb8d..54941934 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * 排课教室 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScheduleSessionClass") public interface TeacherOpenCourseScheduleSessionClassDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java index 35ce2684..d014e21c 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -15,8 +15,8 @@ import java.util.Map; /** * 新增排课 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScheduleSession") public interface TeacherOpenCourseScheduleSessionDao extends BaseMapper{ diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java index 891aa2f2..edcc625a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionSnapDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import javax.validation.constraints.NotNull; import java.util.Collection; @@ -16,8 +16,8 @@ import java.util.List; /** * 课表快照 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScheduleSessionSnap") public interface TeacherOpenCourseScheduleSessionSnapDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java index 041a9f0e..bf111224 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * 课次 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScheduleSessionTag") public interface TeacherOpenCourseScheduleSessionTagDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java index c605098d..82b4b707 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreDashboardDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -14,8 +14,8 @@ import java.util.Map; /** * 成绩 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScoreDashboard") public interface TeacherOpenCourseScoreDashboardDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreWeightDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreWeightDao.java index 4f07e8e0..631e3366 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreWeightDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScoreWeightDao.java @@ -6,15 +6,15 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; /** * 成绩权重 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseScoreWeight") public interface TeacherOpenCourseScoreWeightDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java index dfad0b84..fb50be98 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninLogDao.java @@ -7,7 +7,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -15,8 +15,8 @@ import java.util.Map; /** * 学生签到记录 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseStudentSigninLog") public interface TeacherOpenCourseStudentSigninLogDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java index 28c13484..a9bc3b73 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseStudentSigninSettingDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninSettingQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -13,8 +14,8 @@ import java.util.List; /** * 学生签到设置 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.teacherOpenCourseStudentSigninSetting") public interface TeacherOpenCourseStudentSigninSettingDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java index 9bede8a9..47026497 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java @@ -6,6 +6,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -15,8 +16,8 @@ import java.util.List; /** * UniversitiesColleges Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.universitiesColleges") public interface UniversitiesCollegesDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java index e8efe745..f78d7224 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResour import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -14,8 +15,8 @@ import java.util.List; /** * UniversitiesCollegesJurisdictionCurriculumResources Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.universitiesCollegesJurisdictionCurriculumResources") public interface UniversitiesCollegesJurisdictionCurriculumResourcesDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java index 654d065c..c46bd72e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSyst import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -14,8 +15,8 @@ import java.util.List; /** * UniversitiesCollegesJurisdictionExperimentalSystem Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.universitiesCollegesJurisdictionExperimentalSystem") public interface UniversitiesCollegesJurisdictionExperimentalSystemDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java index ef5df0fd..af7112ec 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.UniversityFacultyQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -14,8 +15,8 @@ import java.util.List; /** * 院系管理 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.universityFaculty") public interface UniversityFacultyDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java index 53e37339..d16c022f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java @@ -5,6 +5,7 @@ import com.ibeetl.jlw.web.query.UniversitySystemQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Component; @@ -14,8 +15,8 @@ import java.util.List; /** * 专业管理 Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.universitySystem") public interface UniversitySystemDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java index f41dc47d..bc224dac 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java @@ -6,7 +6,7 @@ import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,8 +14,8 @@ import java.util.List; /** * WrongQuestion Dao */ -// 实际可以不用加Component注解，调用的地方注入时候，Idea会报红，看着难受 -@Component +// 实际可以不用加Repository注解，调用的地方注入时候，Idea会报红，看着难受 +@Repository @SqlResource("jlw.wrongQuestion") public interface WrongQuestionDao extends BaseMapper{ PageQuery queryByCondition(PageQuery query); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java index 83e947ec..89e7a600 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java @@ -32,7 +32,6 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.assertj.core.util.Lists; import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -574,7 +573,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ .map(TeacherOpenCourseQuestionSettingDTO::getResourcesQuestionIdPlural).collect(joining(",")); // 查询到的题目的数量 - Integer selectCount = ObjectUtil.defaultIfNull(value, Lists.emptyList()).size(); + Integer selectCount = ObjectUtil.defaultIfNull(value, Collections.emptyList()).size(); // 设置其他属性，如果集合长度不为空的话 if (selectCount > 0) {