From 42f3295072eb44377c4c7d630eeb75f67eea613c Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 14 Sep 2022 17:47:46 +0800 Subject: [PATCH] bt3 --- .../admin/console/dao/AuditConsoleDao.java | 7 +- .../admin/console/dao/DictConsoleDao.java | 12 +- .../admin/console/dao/FunctionConsoleDao.java | 9 +- .../admin/console/dao/MenuConsoleDao.java | 7 +- .../admin/console/dao/OrgConsoleDao.java | 17 +- .../admin/console/dao/RoleConsoleDao.java | 13 +- .../console/dao/RoleFunctionConsoleDao.java | 12 +- .../admin/console/dao/UserConsoleDao.java | 4 +- .../service/FunctionConsoleService.java | 19 +- .../console/service/MenuConsoleService.java | 4 +- .../console/service/UserConsoleService.java | 2 +- admin-core/pom.xml | 9 +- .../com/ibeetl/admin/core/conf/BeetlConf.java | 181 +++++------ .../admin/core/conf/MyDebugInterceptor.java | 288 +++++++++--------- .../ibeetl/admin/core/conf/MyIdConfig.java | 5 +- .../ibeetl/admin/core/dao/CoreAuditDao.java | 5 +- .../ibeetl/admin/core/dao/CoreDictDao.java | 15 +- .../ibeetl/admin/core/dao/CoreFileDao.java | 5 +- .../admin/core/dao/CoreFunctionDao.java | 9 +- .../ibeetl/admin/core/dao/CoreMenuDao.java | 9 +- .../com/ibeetl/admin/core/dao/CoreOrgDao.java | 11 +- .../ibeetl/admin/core/dao/CoreRoleDao.java | 11 +- .../admin/core/dao/CoreRoleFunctionDao.java | 10 +- .../admin/core/dao/CoreRoleMenuDao.java | 7 +- .../ibeetl/admin/core/dao/CoreUserDao.java | 6 +- .../admin/core/dao/CoreUserRoleDao.java | 6 +- .../admin/core/dao/CoreWorkflowDao.java | 5 +- .../ibeetl/admin/core/entity/CoreAudit.java | 12 +- .../ibeetl/admin/core/entity/CoreDict.java | 13 +- .../ibeetl/admin/core/entity/CoreFile.java | 10 +- .../admin/core/entity/CoreFunction.java | 15 +- .../ibeetl/admin/core/entity/CoreMenu.java | 16 +- .../com/ibeetl/admin/core/entity/CoreOrg.java | 14 +- .../ibeetl/admin/core/entity/CoreRole.java | 14 +- .../admin/core/entity/CoreRoleFunction.java | 12 +- .../admin/core/entity/CoreRoleMenu.java | 11 +- .../ibeetl/admin/core/entity/CoreUser.java | 4 +- .../admin/core/entity/CoreUserRole.java | 7 +- .../ibeetl/admin/core/file/DBIndexHelper.java | 10 +- .../com/ibeetl/admin/core/gen/BaseTarget.java | 18 +- .../admin/core/service/CoreBaseService.java | 44 +-- .../core/service/CoreCodeGenService.java | 40 ++- .../core/service/CorePlatformService.java | 27 +- .../admin/core/util/enums/DelFlagEnum.java | 2 +- .../core/util/enums/GeneralStateEnum.java | 2 +- .../admin/core/util/enums/RoleTypeEnum.java | 2 +- .../main/resources/codeTemplate/java/dao.java | 4 +- .../resources/codeTemplate/java/service.java | 2 +- .../java/cn/jlw/Interceptor/ActionLog.java | 4 +- .../main/java/cn/jlw/web/WebApplication.java | 3 +- .../ApplicationMergeTeacherOpenCourseDao.java | 4 +- .../java/com/ibeetl/jlw/dao/AttributeDao.java | 7 +- .../ibeetl/jlw/dao/AttributeGroupingDao.java | 7 +- .../ibeetl/jlw/dao/AttributeRelationDao.java | 9 +- .../com/ibeetl/jlw/dao/CompetitionDao.java | 4 +- .../ibeetl/jlw/dao/CompetitionNewsDao.java | 7 +- .../jlw/dao/CompetitionStudentsDao.java | 4 +- .../dao/CompetitionTaskOneQuestionDao.java | 11 +- .../dao/CompetitionTaskSecondQuestionDao.java | 11 +- .../CompetitionTaskSecondQuestionStepDao.java | 9 +- .../dao/CompetitionTeacherEvaluationDao.java | 7 +- .../com/ibeetl/jlw/dao/CourseInfoDao.java | 4 +- .../com/ibeetl/jlw/dao/CourseLabelDao.java | 7 +- .../main/java/com/ibeetl/jlw/dao/ExamDao.java | 4 +- .../com/ibeetl/jlw/dao/ExamStudentsDao.java | 9 +- .../jlw/dao/ExamTaskOneQuestionDao.java | 11 +- .../jlw/dao/ExamTaskSecondQuestionDao.java | 9 +- .../dao/ExamTaskSecondQuestionStepDao.java | 9 +- .../jlw/dao/ExamTaskThreeQuestionDao.java | 9 +- .../jlw/dao/ExamTaskThreeQuestionStepDao.java | 10 +- .../java/com/ibeetl/jlw/dao/IpAddressDao.java | 7 +- .../dao/ResourcesApplicationCourseDao.java | 4 +- .../jlw/dao/ResourcesApplicationDao.java | 7 +- .../jlw/dao/ResourcesCompetitionDao.java | 13 +- .../jlw/dao/ResourcesCompetitionStepDao.java | 9 +- .../com/ibeetl/jlw/dao/ResourcesInfoDao.java | 4 +- .../ibeetl/jlw/dao/ResourcesQuestionDao.java | 4 +- .../ibeetl/jlw/dao/ResourcesTrainingDao.java | 4 +- .../jlw/dao/ResourcesTrainingStepDao.java | 4 +- .../com/ibeetl/jlw/dao/SchoolClassDao.java | 4 +- .../ibeetl/jlw/dao/StudentClientLinkDao.java | 4 +- .../java/com/ibeetl/jlw/dao/StudentDao.java | 4 +- .../ibeetl/jlw/dao/StudentDefenceLogDao.java | 7 +- .../jlw/dao/StudentDefenceLogInfoDao.java | 4 +- .../jlw/dao/StudentDefenceLogNoteDao.java | 4 +- .../jlw/dao/StudentDirectMessagesDao.java | 8 +- .../jlw/dao/StudentQuestionLogAnswerDao.java | 12 +- .../ibeetl/jlw/dao/StudentQuestionLogDao.java | 7 +- .../jlw/dao/StudentQuestionLogInfoDao.java | 7 +- .../java/com/ibeetl/jlw/dao/SysLogDao.java | 4 +- .../java/com/ibeetl/jlw/dao/TeacherDao.java | 4 +- .../jlw/dao/TeacherMergeApplicationDao.java | 4 +- .../jlw/dao/TeacherMergeSchoolClassDao.java | 4 +- .../ibeetl/jlw/dao/TeacherOpenCourseDao.java | 4 +- .../dao/TeacherOpenCourseMergeTeacherDao.java | 4 +- ...cherOpenCourseScheduleSessionClassDao.java | 4 +- .../TeacherOpenCourseScheduleSessionDao.java | 4 +- ...eacherOpenCourseScheduleSessionTagDao.java | 4 +- .../jlw/dao/UniversitiesCollegesDao.java | 4 +- ...gesJurisdictionCurriculumResourcesDao.java | 9 +- ...egesJurisdictionExperimentalSystemDao.java | 9 +- .../ibeetl/jlw/dao/UniversityFacultyDao.java | 4 +- .../ibeetl/jlw/dao/UniversitySystemDao.java | 4 +- .../com/ibeetl/jlw/dao/WrongQuestionDao.java | 4 +- .../ApplicationMergeTeacherOpenCourse.java | 4 +- .../java/com/ibeetl/jlw/entity/Attribute.java | 18 +- .../ibeetl/jlw/entity/AttributeGrouping.java | 18 +- .../ibeetl/jlw/entity/AttributeRelation.java | 18 +- .../com/ibeetl/jlw/entity/Competition.java | 4 +- .../ibeetl/jlw/entity/CompetitionNews.java | 17 +- .../jlw/entity/CompetitionStudents.java | 16 +- .../entity/CompetitionTaskOneQuestion.java | 17 +- .../entity/CompetitionTaskSecondQuestion.java | 18 +- .../CompetitionTaskSecondQuestionStep.java | 18 +- .../entity/CompetitionTeacherEvaluation.java | 18 +- .../com/ibeetl/jlw/entity/CourseInfo.java | 17 +- .../com/ibeetl/jlw/entity/CourseLabel.java | 18 +- .../main/java/com/ibeetl/jlw/entity/Exam.java | 4 +- .../com/ibeetl/jlw/entity/ExamStudents.java | 17 +- .../jlw/entity/ExamTaskOneQuestion.java | 17 +- .../jlw/entity/ExamTaskSecondQuestion.java | 18 +- .../entity/ExamTaskSecondQuestionStep.java | 18 +- .../jlw/entity/ExamTaskThreeQuestion.java | 18 +- .../jlw/entity/ExamTaskThreeQuestionStep.java | 17 +- .../java/com/ibeetl/jlw/entity/IpAddress.java | 18 +- .../jlw/entity/ResourcesApplication.java | 4 +- .../entity/ResourcesApplicationCourse.java | 18 +- .../jlw/entity/ResourcesCompetition.java | 20 +- .../jlw/entity/ResourcesCompetitionStep.java | 19 +- .../com/ibeetl/jlw/entity/ResourcesInfo.java | 20 +- .../ibeetl/jlw/entity/ResourcesQuestion.java | 10 +- .../ibeetl/jlw/entity/ResourcesTraining.java | 10 +- .../jlw/entity/ResourcesTrainingStep.java | 19 +- .../com/ibeetl/jlw/entity/SchoolClass.java | 4 +- .../java/com/ibeetl/jlw/entity/Student.java | 18 +- .../ibeetl/jlw/entity/StudentClientLink.java | 4 +- .../ibeetl/jlw/entity/StudentDefenceLog.java | 18 +- .../jlw/entity/StudentDefenceLogInfo.java | 4 +- .../jlw/entity/StudentDefenceLogNote.java | 17 +- .../jlw/entity/StudentDirectMessages.java | 4 +- .../ibeetl/jlw/entity/StudentQuestionLog.java | 18 +- .../jlw/entity/StudentQuestionLogAnswer.java | 17 +- .../jlw/entity/StudentQuestionLogInfo.java | 4 +- .../java/com/ibeetl/jlw/entity/SysLog.java | 17 +- .../java/com/ibeetl/jlw/entity/Teacher.java | 18 +- .../jlw/entity/TeacherMergeApplication.java | 4 +- .../jlw/entity/TeacherMergeSchoolClass.java | 4 +- .../ibeetl/jlw/entity/TeacherOpenCourse.java | 4 +- .../entity/TeacherOpenCourseMergeTeacher.java | 4 +- .../TeacherOpenCourseScheduleSession.java | 4 +- ...TeacherOpenCourseScheduleSessionClass.java | 4 +- .../TeacherOpenCourseScheduleSessionTag.java | 4 +- .../jlw/entity/UniversitiesColleges.java | 4 +- ...llegesJurisdictionCurriculumResources.java | 17 +- ...ollegesJurisdictionExperimentalSystem.java | 17 +- .../ibeetl/jlw/entity/UniversityFaculty.java | 4 +- .../ibeetl/jlw/entity/UniversitySystem.java | 4 +- .../com/ibeetl/jlw/entity/WrongQuestion.java | 4 +- ...licationMergeTeacherOpenCourseService.java | 3 +- .../jlw/service/AttributeGroupingService.java | 11 +- .../jlw/service/AttributeRelationService.java | 10 +- .../ibeetl/jlw/service/AttributeService.java | 10 +- .../jlw/service/CompetitionNewsService.java | 11 +- .../jlw/service/CompetitionService.java | 5 +- .../service/CompetitionStudentsService.java | 3 +- .../CompetitionTaskOneQuestionService.java | 10 +- .../CompetitionTaskSecondQuestionService.java | 12 +- ...petitionTaskSecondQuestionStepService.java | 14 +- .../CompetitionTeacherEvaluationService.java | 11 +- .../ibeetl/jlw/service/CourseInfoService.java | 3 +- .../jlw/service/CourseLabelService.java | 11 +- .../com/ibeetl/jlw/service/ExamService.java | 5 +- .../jlw/service/ExamStudentsService.java | 11 +- .../service/ExamTaskOneQuestionService.java | 11 +- .../ExamTaskSecondQuestionService.java | 11 +- .../ExamTaskSecondQuestionStepService.java | 13 +- .../service/ExamTaskThreeQuestionService.java | 12 +- .../ExamTaskThreeQuestionStepService.java | 14 +- .../ibeetl/jlw/service/IpAddressService.java | 11 +- .../ResourcesApplicationCourseService.java | 10 +- .../service/ResourcesApplicationService.java | 3 +- .../service/ResourcesCompetitionService.java | 5 +- .../ResourcesCompetitionStepService.java | 11 +- .../jlw/service/ResourcesInfoService.java | 3 +- .../jlw/service/ResourcesQuestionService.java | 5 +- .../jlw/service/ResourcesTrainingService.java | 5 +- .../service/ResourcesTrainingStepService.java | 3 +- .../jlw/service/SchoolClassService.java | 11 +- .../jlw/service/StudentClientLinkService.java | 3 +- .../service/StudentDefenceLogInfoService.java | 11 +- .../service/StudentDefenceLogNoteService.java | 3 +- .../jlw/service/StudentDefenceLogService.java | 11 +- .../service/StudentDirectMessagesService.java | 11 +- .../StudentQuestionLogAnswerService.java | 13 +- .../StudentQuestionLogInfoService.java | 11 +- .../service/StudentQuestionLogService.java | 11 +- .../ibeetl/jlw/service/StudentService.java | 3 +- .../com/ibeetl/jlw/service/SysLogService.java | 7 +- .../TeacherMergeApplicationService.java | 3 +- .../TeacherMergeSchoolClassService.java | 3 +- .../TeacherOpenCourseMergeTeacherService.java | 3 +- ...OpenCourseScheduleSessionClassService.java | 3 +- ...acherOpenCourseScheduleSessionService.java | 3 +- ...erOpenCourseScheduleSessionTagService.java | 3 +- .../jlw/service/TeacherOpenCourseService.java | 3 +- .../ibeetl/jlw/service/TeacherService.java | 3 +- ...urisdictionCurriculumResourcesService.java | 12 +- ...JurisdictionExperimentalSystemService.java | 11 +- .../service/UniversitiesCollegesService.java | 5 +- .../jlw/service/UniversityFacultyService.java | 3 +- .../jlw/service/UniversitySystemService.java | 3 +- .../jlw/service/WrongQuestionService.java | 3 +- web/src/main/resources/application.properties | 2 +- 213 files changed, 977 insertions(+), 1410 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 8181a801..97c98f08 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 @@ -1,10 +1,9 @@ package com.ibeetl.admin.console.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - 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; @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 058530d3..60e001df 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 @@ -1,14 +1,12 @@ package com.ibeetl.admin.console.dao; -import java.util.List; - -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreDict; +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.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * CoreDict Dao 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 fd9ad240..3fb8672f 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 @@ -1,12 +1,13 @@ package com.ibeetl.admin.console.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - 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.Repository; @SqlResource("console.function") +@Repository 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 dce309ca..6d1cee33 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 @@ -1,10 +1,9 @@ package com.ibeetl.admin.console.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - 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.Repository; @SqlResource("console.menu") 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 357d618f..802f1157 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 @@ -1,21 +1,18 @@ package com.ibeetl.admin.console.dao; -import java.util.List; - -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.annotatoin.SqlStatement; -import org.beetl.sql.core.annotatoin.SqlStatementType; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreOrg; import com.ibeetl.admin.core.entity.CoreUser; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.Param; +import org.beetl.sql.mapper.annotation.SqlResource; + +import java.util.List; @SqlResource("console.org") public interface OrgConsoleDao extends BaseMapper { void queryByCondition(PageQuery query); - @SqlStatement(type=SqlStatementType.SELECT) +// @SqlStatement(type=SqlStatementType.SELECT) void queryUserByCondition(PageQuery query); void batchDelByIds(@Param(value = "ids") List ids); } 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 acef3559..83bc2d1d 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 @@ -1,15 +1,12 @@ package com.ibeetl.admin.console.dao; -import java.util.List; - -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - -import com.ibeetl.admin.console.web.query.RoleUserQuery; import com.ibeetl.admin.core.entity.CoreRole; import com.ibeetl.admin.core.entity.CoreUser; -import org.springframework.stereotype.Repository; +import org.beetl.sql.core.engine.PageQuery; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; + +import java.util.List; @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 8acdfeec..09d3332f 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 @@ -1,15 +1,15 @@ package com.ibeetl.admin.console.dao; -import java.util.List; - -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction; import com.ibeetl.admin.core.entity.CoreRoleFunction; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; + +import java.util.List; @SqlResource("console.roleFunction") +@Repository 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 ec34d7f1..18bce0a9 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 @@ -3,9 +3,9 @@ package com.ibeetl.admin.console.dao; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.entity.CoreUserRole; import com.ibeetl.admin.core.util.enums.GeneralStateEnum; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import java.util.List; diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java index 1c3dbfa8..42bf3388 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java @@ -1,14 +1,5 @@ package com.ibeetl.admin.console.service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.beetl.sql.core.engine.PageQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.ibeetl.admin.console.dao.FunctionConsoleDao; import com.ibeetl.admin.console.dao.RoleFunctionConsoleDao; import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction; @@ -22,6 +13,14 @@ import com.ibeetl.admin.core.rbac.tree.FunctionItem; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.util.PlatformException; +import org.beetl.sql.core.engine.PageQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * @author TLT * @@ -63,7 +62,7 @@ public class FunctionConsoleService extends CoreBaseService { public Long saveFunction(CoreFunction function){ - functionDao.insert(function,true); + functionDao.insert(function); platformService.clearFunctionCache(); return function.getId(); } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java index e3f3a4b7..5d972a7a 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java @@ -7,9 +7,7 @@ import com.ibeetl.admin.core.entity.CoreRoleMenu; import com.ibeetl.admin.core.rbac.tree.MenuItem; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; -import com.ibeetl.admin.core.util.ConvertUtil; import com.ibeetl.admin.core.util.PlatformException; - import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +43,7 @@ public class MenuConsoleService extends CoreBaseService { if (queryCount > 0) { throw new PlatformException("菜单编码已存在"); } - menuDao.insert(menu, true); + menuDao.insert(menu); platformService.clearMenuCache(); return menu.getId(); } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java index 5afc9868..ac922301 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java @@ -77,7 +77,7 @@ public class UserConsoleService extends CoreBaseService { user.setState(GeneralStateEnum.ENABLE.getValue()); user.setPassword(passwordEncryptService.password(user.getPassword())); user.setDelFlag(DelFlagEnum.NORMAL.getValue()); - userDao.insert(user, true); + userDao.insert(user); if(StringUtils.isNotEmpty(user.getAttachmentId())){ //更新附件详细信息,关联到这个用户 fileService.updateFile(user.getAttachmentId(), User.class.getSimpleName(), String.valueOf(user.getId())); diff --git a/admin-core/pom.xml b/admin-core/pom.xml index 8f5a2712..bd5a04d6 100644 --- a/admin-core/pom.xml +++ b/admin-core/pom.xml @@ -11,6 +11,7 @@ true + 3.19.0-RELEASE @@ -83,7 +84,7 @@ com.ibeetl beetl-framework-starter - 1.2.38.RELEASE + 1.2.40.Beetl.RELEASE org.slf4j @@ -91,6 +92,12 @@ + + + com.ibeetl + beetlsql + ${beetlsql.version} + com.zaxxer diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java index 75057345..5d62c94a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/BeetlConf.java @@ -1,7 +1,6 @@ package com.ibeetl.admin.core.conf; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ibeetl.admin.core.rbac.DataAccess; import com.ibeetl.admin.core.rbac.DataAccessFactory; import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.util.TimeTool; @@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; @Configuration @AutoConfigureAfter(JasonConfig.class) @@ -100,26 +98,14 @@ public class BeetlConf { groupTemplate.registerFunction("session",sessionFunction); groupTemplate.registerFunctionPackage("dict", dictDownQueryFunction); // 模板页面判断是否有按钮权限,比如canAccess - groupTemplate.registerFunction("canAccess", new Function() { - - @Override - public Boolean call(Object[] paras, Context ctx) { - Long userId = platFormService.getCurrentUser().getId(); - Long orgId = platFormService.getCurrentOrgId(); - String functionCode = (String) paras[0]; - return platFormService.canAcessFunction(userId, orgId, functionCode); - } - + groupTemplate.registerFunction("canAccess", (paras, ctx) -> { + Long userId = platFormService.getCurrentUser().getId(); + Long orgId = platFormService.getCurrentOrgId(); + String functionCode = (String) paras[0]; + return platFormService.canAcessFunction(userId, orgId, functionCode); }); - groupTemplate.registerFunction("abcd", new Function() { - - @Override - public Boolean call(Object[] paras, Context ctx) { - return true; - } - - }); + groupTemplate.registerFunction("abcd", (paras, ctx) -> true); groupTemplate.registerFunction("env", new Function() { @@ -146,129 +132,98 @@ public class BeetlConf { }); - groupTemplate.registerFunction("dataAccessList", new Function() { - - @Override - public List call(Object[] paras, Context ctx) { - return dataAccessFactory.all(); - } - - }); + groupTemplate.registerFunction("dataAccessList", (paras, ctx) -> dataAccessFactory.all()); //根据相应的字符分割字符串 - groupTemplate.registerFunction("splitString", new Function() { - - @Override - public List call(Object[] paras, Context ctx) { - String key = (String)paras[0]; - if(key!=null) { - if(paras.length >= 2){ - String key2 = (String)paras[1]; - return Arrays.asList(key.replace("\r","").split(key2)); - }else { - return Arrays.asList(key.replace("\r","").split("\n")); - } + groupTemplate.registerFunction("splitString", (paras, ctx) -> { + String key = (String)paras[0]; + if(key!=null) { + if(paras.length >= 2){ + String key2 = (String)paras[1]; + return Arrays.asList(key.replace("\r","").split(key2)); + }else { + return Arrays.asList(key.replace("\r","").split("\n")); } - return new ArrayList(); } + return new ArrayList(); }); //判断某个字符在相应字符串中的位置 - groupTemplate.registerFunction("indexOf", new Function() { - - @Override - public Boolean call(Object[] paras, Context ctx) { - String key = (String)paras[0]; - String val = (String)paras[1]; - if(key!=null) { - if(key.indexOf(val) >= 0){ - return true; - }else { - return false; - } + groupTemplate.registerFunction("indexOf", (paras, ctx) -> { + String key = (String)paras[0]; + String val = (String)paras[1]; + if(key!=null) { + if(key.indexOf(val) >= 0){ + return true; + }else { + return false; } - return false; } + return false; }); //替换字符串中的所有相应字符 - groupTemplate.registerFunction("replaceAll", new Function() { - - @Override - public String call(Object[] paras, Context ctx) { - String key = (String)paras[0]; - if(key!=null) { - if(paras.length >= 2){ - String key2 = (String)paras[1]; - if(paras.length == 3){ - return key.replace(key2,(String)paras[2]); - }else { - return key.replace(key2,""); - } + groupTemplate.registerFunction("replaceAll", (paras, ctx) -> { + String key = (String)paras[0]; + if(key!=null) { + if(paras.length >= 2){ + String key2 = (String)paras[1]; + if(paras.length == 3){ + return key.replace(key2,(String)paras[2]); }else { - return key; + return key.replace(key2,""); } + }else { + return key; } - return null; } + return null; }); //替换字符串中的所有相应字符 - groupTemplate.registerFunction("replaceAll", new Function() { - - @Override - public String call(Object[] paras, Context ctx) { - String key = (String)paras[0]; - if(key!=null) { - if(paras.length >= 2){ - String key2 = (String)paras[1]; - if(paras.length == 3){ - return key.replace(key2,(String)paras[2]); - }else { - return key.replace(key2,""); - } + groupTemplate.registerFunction("replaceAll", (paras, ctx) -> { + String key = (String)paras[0]; + if(key!=null) { + if(paras.length >= 2){ + String key2 = (String)paras[1]; + if(paras.length == 3){ + return key.replace(key2,(String)paras[2]); }else { - return key; + return key.replace(key2,""); } + }else { + return key; } - return null; } + return null; }); //根据某个字符分割并且获取长度 - groupTemplate.registerFunction("splitLength", new Function() { - - @Override - public Integer call(Object[] paras, Context ctx) { - String key = (String)paras[0]; - if(key!=null) { - if(paras.length >= 2){ - String key2 = (String)paras[1]; - return key.replace("\r","").split(key2).length; - }else { - return key.replace("\r","").split(",").length; - } + groupTemplate.registerFunction("splitLength", (paras, ctx) -> { + String key = (String)paras[0]; + if(key!=null) { + if(paras.length >= 2){ + String key2 = (String)paras[1]; + return key.replace("\r","").split(key2).length; + }else { + return key.replace("\r","").split(",").length; } - return 0; } + return 0; }); //时间格式转换 Mon Dec 31 00:00:00 CST 2012 - groupTemplate.registerFunction("simpleDateFormat", new Function() { - - @Override - public String call(Object[] paras, Context ctx) { - String key = null; - if(paras[0] != null){ - key = paras[0].toString(); - } - if(key!=null) { - if(paras.length >= 2){ - String key2 = paras[1].toString(); - return TimeTool.getNowTime(TimeTool.getTime(key),key2); - }else { - return TimeTool.getNowTime(TimeTool.getTime(key)); - } + groupTemplate.registerFunction("simpleDateFormat", (paras, ctx) -> { + String key = null; + if(paras[0] != null){ + key = paras[0].toString(); + } + if(key!=null) { + if(paras.length >= 2){ + String key2 = paras[1].toString(); + return TimeTool.getNowTime(TimeTool.getTime(key),key2); + }else { + return TimeTool.getNowTime(TimeTool.getTime(key)); } - return null; } + return null; }); } }; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyDebugInterceptor.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyDebugInterceptor.java index 1987d311..80af82e2 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyDebugInterceptor.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyDebugInterceptor.java @@ -1,143 +1,145 @@ -package com.ibeetl.admin.core.conf; - -import org.beetl.sql.core.InterceptorContext; -import org.beetl.sql.core.JavaType; -import org.beetl.sql.core.SQLManager; -import org.beetl.sql.core.mapper.MapperJavaProxy; -import org.beetl.sql.core.query.LambdaQuery; -import org.beetl.sql.core.query.Query; -import org.beetl.sql.ext.DebugInterceptor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.ResourceBundle; - -/** - * SQL输出到日志 - */ -public class MyDebugInterceptor extends DebugInterceptor { - - static Logger logger = LoggerFactory.getLogger(MyDebugInterceptor.class); - - public static Boolean showBeetlsql = Boolean.parseBoolean(ResourceBundle.getBundle("application") .getString("beetl-beetlsql.dev")); - - private String showName; - - static String mapperName = MapperJavaProxy.class.getName(); - static String sqlManagerName = SQLManager.class.getName(); - static String queryClassName = Query.class.getName(); - static String lambdaQueryName = LambdaQuery.class.getName(); - - public MyDebugInterceptor(String showName) { - super(); - this.showName = showName; - } - - @Override - protected void println(String str) { - String lineSeparator = System.getProperty("line.separator", "\n"); -// String lineSeparator =""; - if(showBeetlsql){ - logger.info(lineSeparator+str); - }else { - System.out.println(lineSeparator+str); - } - } - - @Override - public void before(InterceptorContext ctx) { - String sqlId = ctx.getSqlId(); - if (this.isDebugEanble(sqlId)) { - ctx.put("debug.time", System.currentTimeMillis()); - } - if (this.isSimple(sqlId)) { - return; - } - StringBuilder sb = new StringBuilder(); - String lineSeparator = System.getProperty("line.separator", "\n"); - sb.append("┏━━━━━ "+showName+" Debug [").append(this.getSqlId(formatSql(sqlId))).append("] ━━━").append(lineSeparator) - .append("┣ SQL：\t " + formatSql(ctx.getSql()) + lineSeparator) - .append("┣ 参数：\t " + formatParas(ctx.getParas())).append(lineSeparator); - RuntimeException ex = new RuntimeException(); - StackTraceElement[] traces = ex.getStackTrace(); - int index = lookBusinessCodeInTrace(traces); - StackTraceElement bussinessCode = traces[index]; - String className = bussinessCode.getClassName(); - String mehodName = bussinessCode.getMethodName(); - int line = bussinessCode.getLineNumber(); - sb.append("┣ 位置：\t " + className + "." + mehodName + "(" + bussinessCode.getFileName() + ":" + line + ")" - + lineSeparator); - ctx.put("logs", sb); - } - - @Override - protected int lookBusinessCodeInTrace(StackTraceElement[] traces) { - - String className = getTraceClassName(); - for (int i = traces.length - 1; i >= 0; i--) { - String name = traces[i].getClassName(); - if (className != null && className.equals(name)) { - return i; - } else if (name.equals(mapperName)) { - // 越过sun jdk 代理 - int skipLine = JavaType.isJdk8() ? 3 : 2; - return i + skipLine; - } else if (name.equals(lambdaQueryName)) { - return i + 1; - } else if (name.equals(queryClassName)) { - return i + 1; - } else if (name.equals(sqlManagerName)) { - return i + 1; - } - } - // 不可能到这里 - throw new IllegalStateException(); - - } - - @Override - public void after(InterceptorContext ctx) { - String sqlId = ctx.getSqlId(); - if (this.isSimple(sqlId)) { - this.simpleOut(ctx); - return; - } - long time = System.currentTimeMillis(); - long start = (Long) ctx.get("debug.time"); - String lineSeparator = System.getProperty("line.separator", "\n"); - StringBuilder sb = (StringBuilder) ctx.get("logs"); - sb.append("┣ 时间：\t " + (time - start) + "ms").append(lineSeparator); - if (ctx.isUpdate()) { - sb.append("┣ 更新：\t ["); - if (ctx.getResult().getClass().isArray()) { - int[] ret = (int[]) ctx.getResult(); - for (int i = 0; i < ret.length; i++) { - if (i > 0) - sb.append(","); - sb.append(ret[i]); - } - } else { - sb.append(ctx.getResult()); - } - sb.append("]").append(lineSeparator); - } else { - if (ctx.getResult() instanceof Collection) { - sb.append("┣ 结果：\t [").append(((Collection) ctx.getResult()).size()).append("]").append(lineSeparator); - } else { - sb.append("┣ 结果：\t [").append(ctx.getResult()).append("]").append(lineSeparator); - } - } - sb.append("┗━━━━━ Debug [").append(this.getSqlId(formatSql(ctx.getSqlId()))).append("] ━━━") - .append(lineSeparator); - println(sb.toString()); - } - - public String getShowName() { - return showName; - } - - public void setShowName(String showName) { - this.showName = showName; - } -} +//package com.ibeetl.admin.core.conf; +// +//import org.beetl.sql.clazz.kit.JavaType; +//import org.beetl.sql.core.InterceptorContext; +//import org.beetl.sql.clazz.kit.JavaType; +//import org.beetl.sql.core.SQLManager; +//import org.beetl.sql.mapper.MapperJavaProxy; +//import org.beetl.sql.core.query.LambdaQuery; +//import org.beetl.sql.core.query.Query; +//import org.beetl.sql.ext.DebugInterceptor; +//import org.beetl.sql.mapper.MapperJavaProxy; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//import java.util.Collection; +//import java.util.ResourceBundle; +// +///** +// * SQL输出到日志 +// */ +//public class MyDebugInterceptor extends DebugInterceptor { +// +// static Logger logger = LoggerFactory.getLogger(MyDebugInterceptor.class); +// +// public static Boolean showBeetlsql = Boolean.parseBoolean(ResourceBundle.getBundle("application") .getString("beetl-beetlsql.dev")); +// +// private String showName; +// +// static String mapperName = MapperJavaProxy.class.getName(); +// static String sqlManagerName = SQLManager.class.getName(); +// static String queryClassName = Query.class.getName(); +// static String lambdaQueryName = LambdaQuery.class.getName(); +// +// public MyDebugInterceptor(String showName) { +// super(); +// this.showName = showName; +// } +// +// @Override +// protected void println(String str) { +// String lineSeparator = System.getProperty("line.separator", "\n"); +//// String lineSeparator =""; +// if(showBeetlsql){ +// logger.info(lineSeparator+str); +// }else { +// System.out.println(lineSeparator+str); +// } +// } +// +// @Override +// public void before(InterceptorContext ctx) { +// String sqlId = ctx.getSqlId(); +// if (this.isDebugEanble(sqlId)) { +// ctx.put("debug.time", System.currentTimeMillis()); +// } +// if (this.isSimple(sqlId)) { +// return; +// } +// StringBuilder sb = new StringBuilder(); +// String lineSeparator = System.getProperty("line.separator", "\n"); +// sb.append("┏━━━━━ "+showName+" Debug [").append(this.getSqlId(formatSql(sqlId))).append("] ━━━").append(lineSeparator) +// .append("┣ SQL：\t " + formatSql(ctx.getSql()) + lineSeparator) +// .append("┣ 参数：\t " + formatParas(ctx.getParas())).append(lineSeparator); +// RuntimeException ex = new RuntimeException(); +// StackTraceElement[] traces = ex.getStackTrace(); +// int index = lookBusinessCodeInTrace(traces); +// StackTraceElement bussinessCode = traces[index]; +// String className = bussinessCode.getClassName(); +// String mehodName = bussinessCode.getMethodName(); +// int line = bussinessCode.getLineNumber(); +// sb.append("┣ 位置：\t " + className + "." + mehodName + "(" + bussinessCode.getFileName() + ":" + line + ")" +// + lineSeparator); +// ctx.put("logs", sb); +// } +// +// @Override +// protected int lookBusinessCodeInTrace(StackTraceElement[] traces) { +// +// String className = getTraceClassName(); +// for (int i = traces.length - 1; i >= 0; i--) { +// String name = traces[i].getClassName(); +// if (className != null && className.equals(name)) { +// return i; +// } else if (name.equals(mapperName)) { +// // 越过sun jdk 代理 +// int skipLine = JavaType.isJdk8() ? 3 : 2; +// return i + skipLine; +// } else if (name.equals(lambdaQueryName)) { +// return i + 1; +// } else if (name.equals(queryClassName)) { +// return i + 1; +// } else if (name.equals(sqlManagerName)) { +// return i + 1; +// } +// } +// // 不可能到这里 +// throw new IllegalStateException(); +// +// } +// +// @Override +// public void after(InterceptorContext ctx) { +// String sqlId = ctx.getSqlId(); +// if (this.isSimple(sqlId)) { +// this.simpleOut(ctx); +// return; +// } +// long time = System.currentTimeMillis(); +// long start = (Long) ctx.get("debug.time"); +// String lineSeparator = System.getProperty("line.separator", "\n"); +// StringBuilder sb = (StringBuilder) ctx.get("logs"); +// sb.append("┣ 时间：\t " + (time - start) + "ms").append(lineSeparator); +// if (ctx.isUpdate()) { +// sb.append("┣ 更新：\t ["); +// if (ctx.getResult().getClass().isArray()) { +// int[] ret = (int[]) ctx.getResult(); +// for (int i = 0; i < ret.length; i++) { +// if (i > 0) +// sb.append(","); +// sb.append(ret[i]); +// } +// } else { +// sb.append(ctx.getResult()); +// } +// sb.append("]").append(lineSeparator); +// } else { +// if (ctx.getResult() instanceof Collection) { +// sb.append("┣ 结果：\t [").append(((Collection) ctx.getResult()).size()).append("]").append(lineSeparator); +// } else { +// sb.append("┣ 结果：\t [").append(ctx.getResult()).append("]").append(lineSeparator); +// } +// } +// sb.append("┗━━━━━ Debug [").append(this.getSqlId(formatSql(ctx.getSqlId()))).append("] ━━━") +// .append(lineSeparator); +// println(sb.toString()); +// } +// +// public String getShowName() { +// return showName; +// } +// +// public void setShowName(String showName) { +// this.showName = showName; +// } +//} diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyIdConfig.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyIdConfig.java index e43e260b..b6380a86 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyIdConfig.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/MyIdConfig.java @@ -1,7 +1,6 @@ package com.ibeetl.admin.core.conf; import org.beetl.sql.core.IDAutoGen; -import org.beetl.sql.core.Interceptor; import org.beetl.sql.core.SQLManager; import org.beetl.sql.core.engine.SQLPlaceholderST; import org.beetl.sql.ext.SnowflakeIDWorker; @@ -36,9 +35,9 @@ public class MyIdConfig { @PostConstruct @SuppressWarnings("unchecked") public void init() { - sqlManager.setInters(new Interceptor[]{new MyDebugInterceptor("local ")}); +// sqlManager.setInters(new Interceptor[]{new MyDebugInterceptor("local ")}); - sqlManager.addIdAutonGen("maskAutoID", new IDAutoGen(){ + sqlManager.addIdAutoGen("maskAutoID", new IDAutoGen(){ @Override public synchronized Object nextID(String params) { 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 6701422f..3c0bcea0 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 @@ -1,9 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreAudit; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; /* * 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 742bf4fd..0908ebf5 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 @@ -1,16 +1,13 @@ package com.ibeetl.admin.core.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.admin.core.conf.DataSourceConfig; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.annotatoin.SqlStatement; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreDict; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + /** * 字典DAO接口 */ @@ -41,7 +38,7 @@ public interface CoreDictDao extends BaseMapper { * @param delFlag 删除标记 * @return */ - @SqlStatement(returnType = Map.class) +// @SqlStatement(returnType = Map.class) List> findTypeList(int delFlag); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java index 0fa291cf..99530a84 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java @@ -1,9 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Sql; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreFile; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.Sql; public interface CoreFileDao extends BaseMapper { @Sql("update core_file set biz_type=?,biz_id=? where file_batch_id=?") 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 d8686102..7219c300 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 @@ -1,11 +1,10 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.Sql; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreFunction; +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.Repository; @SqlResource("core.coreFunction") 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 a70b0bbd..7b0e6a76 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 @@ -1,12 +1,9 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.annotatoin.SqlStatement; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - 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.Repository; import java.util.List; 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 0ec931ce..06d5ac9a 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 @@ -1,14 +1,13 @@ package com.ibeetl.admin.core.dao; -import java.util.List; - -import org.beetl.sql.core.annotatoin.Sql; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - 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.Repository; +import java.util.List; + @SqlResource("core.coreOrg") @Repository 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 9f27003c..a46fe387 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 @@ -1,15 +1,12 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreRole; - -import java.util.List; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.stereotype.Repository; @SqlResource("core.coreRole") +@Repository 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 86a1c18d..ea4cdf7c 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 @@ -1,11 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.annotatoin.SqlStatement; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreRoleFunction; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; @@ -15,8 +12,9 @@ import java.util.List; public interface CoreRoleFunctionDao extends BaseMapper { + List getRoleFunction( Long userId, Long orgId, - String code); + String code); List getRoleChildrenFunction(Long userId, Long orgId, Long parentId); 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 ea401524..36cbf32a 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 @@ -1,11 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.annotatoin.SqlStatement; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreRoleMenu; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 fb2ab1fc..851dd56c 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 @@ -1,10 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.Param; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreUser; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 ca3b3e4b..e0ec0184 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 @@ -1,10 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreUserRole; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; @SqlResource("core.coresUserRole") 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 d1c0f949..917378b0 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 @@ -1,9 +1,8 @@ package com.ibeetl.admin.core.dao; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; - import com.ibeetl.admin.core.entity.CoreUser; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import java.util.List; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java index 8e179f0a..177aca0b 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java @@ -1,14 +1,12 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotNull; +import java.util.Date; public class CoreAudit extends BaseEntity { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java index ab4b4dc0..f5a3dc15 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java @@ -1,18 +1,15 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - - -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + /** * 描述: 字典 * @author : TLT diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java index a5c69feb..ac081273 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java @@ -1,11 +1,11 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotNull; +import java.util.Date; /* * diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java index cd926280..8bc5020e 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java @@ -1,16 +1,15 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; -import org.beetl.sql.core.annotatoin.UpdateIgnore; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; +import org.beetl.sql.annotation.entity.UpdateIgnore; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; public class CoreFunction extends BaseEntity { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java index cbdd87b8..5bcb0edb 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java @@ -1,17 +1,15 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; -import org.beetl.sql.core.annotatoin.UpdateIgnore; - import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; +import org.beetl.sql.annotation.entity.UpdateIgnore; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * 系统菜单 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java index 9e9dd954..080def8c 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java @@ -1,17 +1,15 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java index 75e0b41e..028c7931 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java @@ -1,16 +1,14 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * 角色 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java index 56f027ee..bebd0279 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java @@ -1,14 +1,12 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotNull; +import java.util.Date; /* * diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java index aa03eb50..194ca6cb 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java @@ -1,12 +1,11 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; - -import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; + +import javax.validation.constraints.NotNull; +import java.util.Date; /* * diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java index 7132e696..9e7ff9a6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java @@ -5,8 +5,8 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.enums.MenuEnums; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.admin.core.util.enums.CoreDictType; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java index 5187e9e4..92b84bac 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java @@ -1,11 +1,10 @@ package com.ibeetl.admin.core.entity; -import java.util.Date; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; - -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import java.util.Date; /* * 用户角色关系 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java b/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java index 8a6f3c2d..03762385 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java @@ -1,14 +1,10 @@ package com.ibeetl.admin.core.file; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.ibeetl.admin.core.dao.CoreFileDao; import com.ibeetl.admin.core.entity.CoreFile; +import java.util.List; + /** * 从数据库搜索文档信息，对应core_file,和core_file_tag,目前先忽略tag功能 * @author TLT @@ -37,7 +33,7 @@ public class DBIndexHelper { public void createFileItem(CoreFile file,List tags) { - fileDao.insert(file,true); + fileDao.insert(file); if(tags==null||tags.isEmpty()) { return ; } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java b/admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java index 36793d88..24878e50 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java @@ -2,8 +2,6 @@ package com.ibeetl.admin.core.gen; import com.ibeetl.admin.core.util.beetl.VerifyForamtFunction; import org.beetl.core.Configuration; -import org.beetl.core.Context; -import org.beetl.core.Function; import org.beetl.core.GroupTemplate; import org.beetl.core.resource.ClasspathResourceLoader; @@ -40,14 +38,9 @@ public abstract class BaseTarget implements Target { cfg.build(); gt = new GroupTemplate(rs,cfg); gt.registerFunction("verifyFormat", new VerifyForamtFunction()); - gt.registerFunction("upperFirst", new Function() { - - @Override - public Object call(Object[] paras, Context ctx) { - String s = (String)paras[0]; - return upperFirst(s); - - } + gt.registerFunction("upperFirst", (paras, ctx) -> { + String s = (String)paras[0]; + return upperFirst(s); }); } catch (IOException e) { @@ -57,12 +50,13 @@ public abstract class BaseTarget implements Target { } public static String upperFirst(String s) { - if (Character.isUpperCase(s.charAt(0))) + if (Character.isUpperCase(s.charAt(0))) { return s; - else + } else { return (new StringBuilder()) .append(Character.toUpperCase(s.charAt(0))) .append(s.substring(1)).toString(); + } } public GroupTemplate getGt() { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java index 99d64998..7177ea6f 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java @@ -57,14 +57,14 @@ public class CoreBaseService { * @param paras * @return */ - public List queryByObject(Object paras,String orderBy) { - if(!(paras instanceof TailBean)){ - throw new PlatformException("指定的pojo"+paras.getClass()+" 不能获取数据字典，需要继承TailBean"); - } - TailBean ext = (TailBean)paras; - Class c = ext.getClass(); - return (List) sqlManager.template(c,paras,orderBy); - } +// public List queryByObject(Object paras,String orderBy) { +// if(!(paras instanceof TailBean)){ +// throw new PlatformException("指定的pojo"+paras.getClass()+" 不能获取数据字典，需要继承TailBean"); +// } +// TailBean ext = (TailBean)paras; +// Class c = ext.getClass(); +// return (List) sqlManager.template(c,paras,orderBy); +// } /** * 根据实体查询实体对象List @@ -89,7 +89,7 @@ public class CoreBaseService { * @return */ public List queryByObject(Class c,Object paras,String orderBy) { - return (List) sqlManager.template(c,paras,orderBy); + return (List) sqlManager.template(c); } @@ -111,7 +111,7 @@ public class CoreBaseService { * @return */ public boolean save(T model) { - return sqlManager.insert(model,true) > 0; + return sqlManager.insert(model) > 0; } /** @@ -120,7 +120,7 @@ public class CoreBaseService { * @return */ public boolean insert(T model) { - return sqlManager.insert(model.getClass(),model,true)> 0; + return sqlManager.insert(model.getClass())> 0; } /** @@ -129,10 +129,11 @@ public class CoreBaseService { * @return */ public boolean saveBatch(List list){ - if(list.size()>0) + if(list.size()>0) { return sqlManager.insertBatch(list.get(0).getClass(),list).length > 0; - else + } else { return false; + } } /** @@ -149,10 +150,11 @@ public class CoreBaseService { * @return */ public boolean insertBatch(List list, Boolean autoDbAssignKey){ - if(list.size()>0) - return sqlManager.insertBatch(list.get(0).getClass(),list,autoDbAssignKey).length > 0; - else + if(list.size()>0) { + return sqlManager.insertBatch(list.get(0).getClass(),list).length > 0; + } else { return false; + } } /** @@ -240,10 +242,11 @@ public class CoreBaseService { * @return */ public boolean updateBatch(List list) { - if(list.size()>0) + if(list.size()>0) { return sqlManager.updateByIdBatch(list).length > 0; - else + } else { return false; + } } /** @@ -252,10 +255,11 @@ public class CoreBaseService { * @return */ public boolean updateBatchTemplate(List list) { - if(list.size()>0) + if(list.size()>0) { return sqlManager.updateBatchTemplateById(list.get(0).getClass(),list).length > 0; - else + } else { return false; + } } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java index 55c47c40..60b12fed 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java @@ -1,24 +1,22 @@ package com.ibeetl.admin.core.service; -import java.util.*; - +import com.ibeetl.admin.core.entity.CoreFunction; +import com.ibeetl.admin.core.entity.CoreMenu; +import com.ibeetl.admin.core.gen.model.Attribute; +import com.ibeetl.admin.core.gen.model.Entity; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.beetl.sql.core.JavaType; -import org.beetl.sql.core.NameConversion; +import org.beetl.sql.clazz.ColDesc; +import org.beetl.sql.clazz.NameConversion; +import org.beetl.sql.clazz.TableDesc; +import org.beetl.sql.clazz.kit.JavaType; import org.beetl.sql.core.SQLManager; -import org.beetl.sql.core.db.ClassDesc; -import org.beetl.sql.core.db.ColDesc; -import org.beetl.sql.core.db.MetadataManager; -import org.beetl.sql.core.db.TableDesc; +import org.beetl.sql.core.meta.MetadataManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ibeetl.admin.core.entity.CoreFunction; -import com.ibeetl.admin.core.entity.CoreMenu; -import com.ibeetl.admin.core.gen.model.Attribute; -import com.ibeetl.admin.core.gen.model.Entity; +import java.util.*; /** * 代码生成，用于根据表或者视图生成entity，mapper，service，conroller @@ -69,7 +67,6 @@ public class CoreCodeGenService { if(tableDesc==null) { return null; } - ClassDesc classDesc = tableDesc .getClassDesc(nc); Entity e = new Entity(); e.setName(nc.getClassName(table)); e.setComment(tableDesc.getRemark()); @@ -84,7 +81,6 @@ public class CoreCodeGenService { if(tableDesc==null) { return null; } - ClassDesc classDesc = tableDesc .getClassDesc(nc); Entity e = new Entity(); e.setName(nc.getClassName(table)); e.setComment(tableDesc.getRemark()); @@ -104,8 +100,8 @@ public class CoreCodeGenService { attr.setId(true); e.setIdAttribute(attr); } - attr.setComment(desc.remark); - String type = JavaType.getType(desc.sqlType, desc.size, desc.digit); + attr.setComment(desc.getRemark()); + String type = JavaType.getType(desc.getSqlType(), desc.getSize(), desc.getDigit()); if(type.equals("Double")){ type = "BigDecimal"; } @@ -136,7 +132,7 @@ public class CoreCodeGenService { query.setCode(indexFunctonCode); Object o = sqlManager.templateOne(query); if(o != null){ - return -1l; + return -1L; } //设置父功能点 @@ -146,7 +142,7 @@ public class CoreCodeGenService { rootFunction.setCreateTime(new Date()); rootFunction.setParentId(0L); rootFunction.setType("FN0"); - sqlManager.insert(rootFunction,true); + sqlManager.insert(rootFunction); Long parentId =rootFunction.getId(); //设置曾删改查功能点 @@ -158,7 +154,7 @@ public class CoreCodeGenService { indexFunction.setAccessUrl("/"+data.getSystem()+"/"+data.getCode()+"/index.do"); //设置为查询功能 indexFunction.setType("FN1"); - sqlManager.insert(indexFunction,true); + sqlManager.insert(indexFunction); CoreFunction upateFunction = new CoreFunction(); @@ -168,7 +164,7 @@ public class CoreCodeGenService { upateFunction.setCreateTime(new Date()); upateFunction.setParentId(parentId); upateFunction.setType("FN0"); - sqlManager.insert(upateFunction,true); + sqlManager.insert(upateFunction); CoreFunction addFunction = new CoreFunction(); String addFunctionCode = functionCode+".add"; @@ -177,7 +173,7 @@ public class CoreCodeGenService { addFunction.setCreateTime(new Date()); addFunction.setParentId(parentId); addFunction.setType("FN0"); - sqlManager.insert(addFunction,true); + sqlManager.insert(addFunction); CoreFunction delFunction = new CoreFunction(); @@ -187,7 +183,7 @@ public class CoreCodeGenService { delFunction.setCreateTime(new Date()); delFunction.setParentId(parentId); delFunction.setType("FN0"); - sqlManager.insert(delFunction,true); + sqlManager.insert(delFunction); //刷新缓存 platformService.clearFunctionCache(); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 3bc78daa..05812190 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -10,7 +10,7 @@ import com.ibeetl.admin.core.util.*; import com.ibeetl.admin.core.util.beetl.*; import com.ibeetl.admin.core.util.enums.DelFlagEnum; import org.apache.commons.lang3.StringUtils; -import org.beetl.sql.core.SQLManager; +import org.beetl.core.GroupTemplate; import org.beetl.sql.core.engine.SQLPlaceholderST; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -18,6 +18,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -61,14 +62,14 @@ public class CorePlatformService { public static final String ACCESS_SUPPER_ADMIN = "admin"; @Autowired HttpRequestLocal httpRequestLocal; - @Autowired CoreRoleFunctionDao roleFunctionDao; - @Autowired CoreRoleMenuDao sysRoleMenuDao; + @Resource + CoreRoleMenuDao sysRoleMenuDao; @Autowired CoreOrgDao sysOrgDao; @Autowired CoreRoleFunctionDao sysRoleFunctionDao; @Autowired CoreMenuDao sysMenuDao; @Autowired CoreUserDao sysUserDao; @Autowired CoreFunctionDao sysFunctionDao; - @Autowired SQLManager sqlManager; + @Autowired GroupTemplate groupTemplate; @Autowired DataAccessFunction dataAccessFunction; @Autowired CorePlatformService self; @Autowired DataAccessFactory dataAccessFactory; @@ -85,23 +86,23 @@ public class CorePlatformService { public void init() { SQLPlaceholderST.textFunList.add("function"); //sql语句里带有此函数来判断数据权限 - sqlManager.getBeetl().getGroupTemplate().registerFunction("function", dataAccessFunction); + groupTemplate.registerFunction("function", dataAccessFunction); //明天 - sqlManager.getBeetl().getGroupTemplate().registerFunction("nextDay", new NextDayFunction()); + groupTemplate.registerFunction("nextDay", new NextDayFunction()); //跳转路径配置 - sqlManager.getBeetl().getGroupTemplate().registerFunction("getUrl", urlFunction); + groupTemplate.registerFunction("getUrl", urlFunction); //默认ID到100的辅助表 用于分割循环 - sqlManager.getBeetl().getGroupTemplate().registerFunction("numTable", numFunction); + groupTemplate.registerFunction("numTable", numFunction); //数据库名配置 - sqlManager.getBeetl().getGroupTemplate().registerFunction("getDataTableName", dataTableName); + groupTemplate.registerFunction("getDataTableName", dataTableName); //订单过期时间配置 - sqlManager.getBeetl().getGroupTemplate().registerFunction("getTimeLimit", timeLimit); + groupTemplate.registerFunction("getTimeLimit", timeLimit); //订单评论过期天数配置 - sqlManager.getBeetl().getGroupTemplate().registerFunction("getCommentLimit", commentTimeLimit); + groupTemplate.registerFunction("getCommentLimit", commentTimeLimit); //分割判断 - sqlManager.getBeetl().getGroupTemplate().registerFunction("split", splitFunction); + groupTemplate.registerFunction("split", splitFunction); //根据操作人员的集团显示相应的会员等级 - sqlManager.getBeetl().getGroupTemplate().registerFunction("rankJurisdiction", rankJurisdictionFunction); + groupTemplate.registerFunction("rankJurisdiction", rankJurisdictionFunction); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/DelFlagEnum.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/DelFlagEnum.java index b9983ff1..5f1dc064 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/DelFlagEnum.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/DelFlagEnum.java @@ -1,6 +1,6 @@ package com.ibeetl.admin.core.util.enums; -import org.beetl.sql.core.annotatoin.EnumMapping; +import org.beetl.sql.annotation.entity.EnumMapping; /** * 描述:数据是否被逻辑删除 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/GeneralStateEnum.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/GeneralStateEnum.java index 32a45c14..41575b12 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/GeneralStateEnum.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/GeneralStateEnum.java @@ -1,6 +1,6 @@ package com.ibeetl.admin.core.util.enums; -import org.beetl.sql.core.annotatoin.EnumMapping; +import org.beetl.sql.annotation.entity.EnumMapping; /** * 描述:数据是否有效 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/RoleTypeEnum.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/RoleTypeEnum.java index 0cb02932..53027551 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/RoleTypeEnum.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/RoleTypeEnum.java @@ -1,6 +1,6 @@ package com.ibeetl.admin.core.util.enums; -import org.beetl.sql.core.annotatoin.EnumMapping; +import org.beetl.sql.annotation.entity.EnumMapping; /** * 描述: 工作流角色 diff --git a/admin-core/src/main/resources/codeTemplate/java/dao.java b/admin-core/src/main/resources/codeTemplate/java/dao.java index 021e7257..de21f878 100644 --- a/admin-core/src/main/resources/codeTemplate/java/dao.java +++ b/admin-core/src/main/resources/codeTemplate/java/dao.java @@ -6,8 +6,8 @@ import java.util.Map; import ${basePackage}.entity.*; import ${basePackage}.web.query.${entity.name}Query; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; import org.springframework.stereotype.Repository; diff --git a/admin-core/src/main/resources/codeTemplate/java/service.java b/admin-core/src/main/resources/codeTemplate/java/service.java index 5922ba87..d0e857ec 100644 --- a/admin-core/src/main/resources/codeTemplate/java/service.java +++ b/admin-core/src/main/resources/codeTemplate/java/service.java @@ -142,7 +142,7 @@ public class ${entity.name}Service extends CoreBaseService<${entity.name}>{ } public List<${entity.name}> getValues (Object paras){ - return sqlManager.select("jlw.${entity.code}.get${entity.name}Values",${entity.name}.class,paras); + return sqlManager.select(SqlId.of("jlw.${entity.code}.get${entity.name}Values",${entity.name}.class,paras); } public List<${entity.name}> getValuesByQuery (${entity.name}Query ${entity.code}Query){ diff --git a/web/src/main/java/cn/jlw/Interceptor/ActionLog.java b/web/src/main/java/cn/jlw/Interceptor/ActionLog.java index 3cc8f0e8..27c0c781 100644 --- a/web/src/main/java/cn/jlw/Interceptor/ActionLog.java +++ b/web/src/main/java/cn/jlw/Interceptor/ActionLog.java @@ -12,10 +12,10 @@ import com.ibeetl.jlw.service.SysLogService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.method.HandlerMethod; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; import java.util.concurrent.*; @@ -28,7 +28,7 @@ import java.util.concurrent.*; @Service public class ActionLog { - @Autowired + @Resource private CorePlatformService platformService; private final Log log = LogFactory.getLog(this.getClass()); diff --git a/web/src/main/java/cn/jlw/web/WebApplication.java b/web/src/main/java/cn/jlw/web/WebApplication.java index d08b1eed..cba52cbb 100644 --- a/web/src/main/java/cn/jlw/web/WebApplication.java +++ b/web/src/main/java/cn/jlw/web/WebApplication.java @@ -2,7 +2,6 @@ package cn.jlw.web; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; @@ -28,7 +27,7 @@ public class WebApplication extends SpringBootServletInitializer implements WebA @Bean public ConfigurableServletWebServerFactory webServerFactory() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); - factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\")); + factory.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "|{}[]\\")); return factory; } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java index 3cef80e2..d8b1f7bf 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ApplicationMergeTeacherOpenCourseDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse; import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 f0c90077..b19a40a4 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.Attribute; 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; 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 d9b1add1..fbec13fc 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeGroupingDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.AttributeGrouping; 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; 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 b8e56e51..343e5651 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/AttributeRelationDao.java @@ -1,12 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.AttributeRelation; 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; 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 32e315f9..ca5a28ae 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.Competition; import com.ibeetl.jlw.web.query.CompetitionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 470bad11..549c9ee3 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionNewsDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.CompetitionNews; 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; 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 f4b99625..b4cd322d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionStudentsDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.CompetitionStudents; import com.ibeetl.jlw.web.query.CompetitionStudentsQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 f1609b77..4eaea1bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskOneQuestionDao.java @@ -1,14 +1,15 @@ package com.ibeetl.jlw.dao; -import java.math.BigDecimal; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.math.BigDecimal; +import java.util.List; + /** * CompetitionTaskOneQuestion Dao 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 282d6674..724beb70 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionDao.java @@ -1,15 +1,14 @@ package com.ibeetl.jlw.dao; -import java.math.BigDecimal; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; +import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion; import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * CompetitionTaskSecondQuestion Dao 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 b5b7eb70..4ced9c1a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTaskSecondQuestionStepDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestionStep; import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionStepQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * CompetitionTaskSecondQuestionStep Dao 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 b8f8bd85..c178b56b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CompetitionTeacherEvaluationDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.CompetitionTeacherEvaluation; 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; 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 2fbf4ead..70b3b455 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseInfoDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.web.query.CourseInfoQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 5cd489df..afae9cb1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/CourseLabelDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.CourseLabel; 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; 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 6c14872a..b2b4d63a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.Exam; import com.ibeetl.jlw.web.query.ExamQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 ece27dd5..70c9815f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamStudentsDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.ExamStudents; import com.ibeetl.jlw.web.query.ExamStudentsQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ExamStudents Dao 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 65eeb4e6..001db133 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskOneQuestionDao.java @@ -1,14 +1,15 @@ package com.ibeetl.jlw.dao; -import java.math.BigDecimal; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.ExamTaskOneQuestion; import com.ibeetl.jlw.web.query.ExamTaskOneQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.math.BigDecimal; +import java.util.List; + /** * ExamTaskOneQuestion Dao 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 a6c223c9..d8336229 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ExamTaskSecondQuestion Dao 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 52dce308..6c45f46b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskSecondQuestionStepDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.ExamTaskSecondQuestionStep; import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ExamTaskSecondQuestionStep Dao 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 4732ff79..ccbe0321 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.ExamTaskThreeQuestion; import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ExamTaskThreeQuestion Dao 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 41a3aac3..366445ef 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ExamTaskThreeQuestionStepDao.java @@ -1,14 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery; +import com.ibeetl.jlw.entity.ExamTaskThreeQuestionStep; import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionStepQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ExamTaskThreeQuestionStep Dao 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 736b5a78..c3914458 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/IpAddressDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.IpAddress; 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; 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 12870df0..98ec4c39 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationCourseDao.java @@ -1,9 +1,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.ResourcesApplicationCourse; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; 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 d47ef03e..987c85f8 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesApplicationDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.ResourcesApplication; 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; 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 c5102b37..097e7594 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionDao.java @@ -1,15 +1,18 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion; +import com.ibeetl.jlw.entity.CourseInfo; +import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; +import com.ibeetl.jlw.entity.ResourcesCompetition; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesCompetitionQuery; -import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * ResourcesCompetition Dao 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 ce9d2a48..bc975171 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesCompetitionStepDao.java @@ -1,12 +1,13 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.ResourcesCompetitionStep; 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 java.util.List; + /** * ResourcesCompetitionStep Dao 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 4098997c..57f9a79f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesInfoDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.web.query.ResourcesInfoQuery; -import org.beetl.sql.core.annotatoin.SqlResource; +import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; import org.springframework.stereotype.Repository; import java.util.List; 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 115870e7..d1b4bd87 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java @@ -4,9 +4,9 @@ import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; +import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; import org.springframework.stereotype.Repository; import java.util.List; 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 db4b941f..058c478f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingDao.java @@ -4,8 +4,8 @@ import java.util.List; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesTrainingQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; +import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.core.engine.PageQuery; import org.springframework.stereotype.Repository; 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 e9bdad64..990d40a7 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesTrainingStepDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.ResourcesTrainingStep; import com.ibeetl.jlw.web.query.ResourcesTrainingStepQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 4cc08c58..907f4f42 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.web.query.SchoolClassQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 db8b97b4..f9609ca2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentClientLinkDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.StudentClientLink; import com.ibeetl.jlw.web.query.StudentClientLinkQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 f3c03b70..a496866d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -3,9 +3,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.web.query.StudentQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 156cde38..b7b3acf6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.StudentDefenceLog; 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; 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 50a19d66..ec7c3d2a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogInfoDao.java @@ -1,9 +1,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.StudentDefenceLogInfo; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; 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 3e0cbd60..e78c5a32 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDefenceLogNoteDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.StudentDefenceLogNote; import com.ibeetl.jlw.web.query.StudentDefenceLogNoteQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 834c2c74..3999ed2a 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDirectMessagesDao.java @@ -1,11 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.web.query.StudentDirectMessagesQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.StudentDirectMessages; 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; 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 c10fec41..3a0c57ad 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogAnswerDao.java @@ -1,16 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import java.util.Map; - -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.StudentQuestionLogAnswer; import com.ibeetl.jlw.web.query.StudentQuestionLogAnswerQuery; - -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * StudentQuestionLogAnswer Dao 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 b9943cf3..5e2096f0 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.StudentQuestionLog; 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; 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 4621370f..48426093 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentQuestionLogInfoDao.java @@ -1,10 +1,9 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; +import com.ibeetl.jlw.entity.StudentQuestionLogInfo; 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; 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 2e7cada0..eedaf6bb 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SysLogDao.java @@ -1,9 +1,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.SysLog; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.Date; 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 08e61333..6548e3a6 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.Teacher; import com.ibeetl.jlw.web.query.TeacherQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 e67d5bae..7f498665 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherMergeApplication; import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java index 56167f17..fadbba52 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeSchoolClassDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherMergeSchoolClass; import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 036a5eff..ae1df12e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourse; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 ddcf3707..6070af40 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 a08a61d2..6777e0f1 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionClassDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 35a44bb2..89933dbe 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSession; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 a61d5077..001d2e3e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseScheduleSessionTagDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 d4b5211b..dac0542f 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.UniversitiesColleges; import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 c081a6db..84129253 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionCurriculumResourcesDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * UniversitiesCollegesJurisdictionCurriculumResources Dao 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 f7687e1f..51ec283e 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesJurisdictionExperimentalSystemDao.java @@ -1,13 +1,14 @@ package com.ibeetl.jlw.dao; -import java.util.List; -import com.ibeetl.jlw.entity.*; +import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery; -import org.beetl.sql.core.annotatoin.SqlResource; -import org.beetl.sql.core.mapper.BaseMapper; 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 java.util.List; + /** * UniversitiesCollegesJurisdictionExperimentalSystem Dao 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 b2a7fef2..ab10698d 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.UniversityFaculty; import com.ibeetl.jlw.web.query.UniversityFacultyQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 638203cd..46996d38 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.UniversitySystem; import com.ibeetl.jlw.web.query.UniversitySystemQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; 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 27e34761..9444c235 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/WrongQuestionDao.java @@ -2,9 +2,9 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.WrongQuestion; import com.ibeetl.jlw.web.query.WrongQuestionQuery; -import org.beetl.sql.core.annotatoin.SqlResource; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.mapper.BaseMapper; +import org.beetl.sql.mapper.BaseMapper; +import org.beetl.sql.mapper.annotation.SqlResource; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java index f63b94a1..7b5777d4 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ApplicationMergeTeacherOpenCourse.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java b/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java index f6c4845f..21d35c02 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Attribute.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 属性 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java b/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java index 60f7ec86..28acea3d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/AttributeGrouping.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 属性分组 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java b/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java index 12b0447e..0832831e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/AttributeRelation.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 属性关系表 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java index 09c5fe4b..fb43f3d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java index 034d956a..6c67efe3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionNews.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java index f09cfdc6..f8509ad1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionStudents.java @@ -1,19 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java index 4c1ba500..0af7a454 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskOneQuestion.java @@ -1,21 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 大赛任务一试题 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java index 3af908ed..794154a3 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestion.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 大赛任务二试题 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java index 7fcc692c..230f22dd 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTaskSecondQuestionStep.java @@ -1,22 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 大赛任务二试题步骤 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java index 38fef2ea..2ad0fdf1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CompetitionTeacherEvaluation.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 大赛教师评分详情表 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java index 60d1aa45..dcc4ace7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CourseInfo.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java b/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java index b6cf815b..1e154afc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/CourseLabel.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 课程管理 - 标签管理 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Exam.java b/web/src/main/java/com/ibeetl/jlw/entity/Exam.java index 153530e5..71f8e551 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Exam.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Exam.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java index 7194fd52..ee60febb 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamStudents.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java index f800aede..a0a716ef 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskOneQuestion.java @@ -1,21 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 考试任务一试题 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java index d80809c5..8798cebc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestion.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 考试任务二试题 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java index 2c792ff6..892b29f0 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskSecondQuestionStep.java @@ -1,22 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.annotation.Query; -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 大赛任务二试题步骤 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java index d0bb7816..e47a54ea 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestion.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 考试任务三试题 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java index 226f94b5..ef47ef97 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ExamTaskThreeQuestionStep.java @@ -1,21 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 大赛任务三试题步骤 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java b/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java index 3825aa3c..44a11650 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/IpAddress.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java index 07302200..e33b979d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplication.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java index 279ececa..9b45a973 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesApplicationCourse.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 应用管理 和 课程 关联 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java index 491616c5..f86aa18d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java @@ -1,22 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /* * 资源管理 - 竞赛案例管理 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java index 3bb51945..d0d106df 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetitionStep.java @@ -1,22 +1,13 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 资源管理 - 竞赛案例步骤 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java index c1370528..c90d826e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java @@ -1,22 +1,12 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /* * 资源管理 - 资源管理 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java index 326b80c3..9347c513 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java @@ -3,16 +3,16 @@ package com.ibeetl.jlw.entity; import javax.validation.constraints.NotNull; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; +import org.beetl.sql.annotation.entity.InsertIgnore; +import org.beetl.sql.annotation.entity.Version; +import org.beetl.sql.annotation.entity.LogicDelete; import java.math.BigDecimal; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java index 4f8c25d4..6e7940ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java @@ -4,16 +4,16 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; +import org.beetl.sql.annotation.entity.InsertIgnore; +import org.beetl.sql.annotation.entity.Version; +import org.beetl.sql.annotation.entity.LogicDelete; import java.math.BigDecimal; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java index c6d193a8..95c81dc8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTrainingStep.java @@ -1,22 +1,13 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /* * 资源管理 - 实训案例步骤 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java index acf6fcd4..47620bfc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Student.java b/web/src/main/java/com/ibeetl/jlw/entity/Student.java index 40741774..f5407047 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Student.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Student.java @@ -1,21 +1,13 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; - import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java index 3175ed1f..fd832e12 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentClientLink.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java index 8962f4e6..59f6f2a4 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLog.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 学生答辩记录 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java index 9dd0e343..7011e1e7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogInfo.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java index f1cb4777..c4b260e5 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDefenceLogNote.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java index 9f9dc392..403dee4e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentDirectMessages.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java index c9ac762f..e4f551fa 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLog.java @@ -1,21 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; -import java.util.Date; +import javax.validation.constraints.NotNull; /* * 学生练题记录 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java index 37bdf081..0f4ad336 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogAnswer.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java index 5d0c073e..3a4d7685 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentQuestionLogInfo.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.math.BigDecimal; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java b/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java index 3f1b8f1b..e226f973 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 00045881..03e48dfc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -1,21 +1,13 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; - import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java index 39860f41..1af7a615 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeApplication.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java index 13cd9222..607ae3b1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherMergeSchoolClass.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java index 306f6ffe..a71d8965 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java index b2d27562..4a8f9f1c 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeTeacher.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index 23722343..d8de7212 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java index 6c9610e1..47cfc2c6 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionClass.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java index f936d229..d71f0329 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java index 3ef62946..5b2b4502 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java @@ -2,8 +2,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java index dde8f477..ff041469 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionCurriculumResources.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java index 445b6115..19708b00 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesJurisdictionExperimentalSystem.java @@ -1,20 +1,11 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - -import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; - import cn.jlw.validate.ValidateConfig; +import com.ibeetl.admin.core.entity.BaseEntity; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; -import com.ibeetl.admin.core.annotation.Dict; - -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java index a4955ccf..32bf1e4a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java index a0b99d1e..2c6868c7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; -import org.beetl.sql.core.annotatoin.AssignID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AssignID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java index be58061a..f769204b 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/WrongQuestion.java @@ -3,8 +3,8 @@ package com.ibeetl.jlw.entity; import cn.jlw.aliPay.utils.StringUtils; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; import javax.validation.constraints.NotNull; diff --git a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java index eb04b669..722add55 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ApplicationMergeTeacherOpenCourseService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.ApplicationMergeTeacherOpenCourseDao; import com.ibeetl.jlw.entity.ApplicationMergeTeacherOpenCourse; import com.ibeetl.jlw.web.query.ApplicationMergeTeacherOpenCourseQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class ApplicationMergeTeacherOpenCourseService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.applicationMergeTeacherOpenCourse.getApplicationMergeTeacherOpenCourseValues",ApplicationMergeTeacherOpenCourse.class,paras); + return sqlManager.select(SqlId.of("jlw.applicationMergeTeacherOpenCourse.getApplicationMergeTeacherOpenCourseValues"),ApplicationMergeTeacherOpenCourse.class,paras); } public List getValuesByQuery (ApplicationMergeTeacherOpenCourseQuery applicationMergeTeacherOpenCourseQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/AttributeGroupingService.java b/web/src/main/java/com/ibeetl/jlw/service/AttributeGroupingService.java index 8b8f4e8d..731eb3f8 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/AttributeGroupingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/AttributeGroupingService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.AttributeGroupingDao; -import com.ibeetl.jlw.entity.AttributeGrouping; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.AttributeGroupingDao; +import com.ibeetl.jlw.entity.AttributeGrouping; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class AttributeGroupingService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.attributeGrouping.getAttributeGroupingValues",AttributeGrouping.class,paras); + return sqlManager.select(SqlId.of("jlw.attributeGrouping.getAttributeGroupingValues"),AttributeGrouping.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/AttributeRelationService.java b/web/src/main/java/com/ibeetl/jlw/service/AttributeRelationService.java index 0309de5c..e84d0cb0 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/AttributeRelationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/AttributeRelationService.java @@ -4,12 +4,11 @@ package com.ibeetl.jlw.service; import cn.jlw.aliPay.utils.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.ibeetl.jlw.dao.AttributeRelationDao; -import com.ibeetl.jlw.entity.*; - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.AttributeRelationDao; +import com.ibeetl.jlw.entity.AttributeRelation; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** @@ -142,6 +140,6 @@ public class AttributeRelationService extends CoreBaseService public List getValues (Object paras){ - return sqlManager.select("jlw.attributeRelation.getAttributeRelationValues",AttributeRelation.class,paras); + return sqlManager.select(SqlId.of("jlw.attributeRelation.getAttributeRelationValues"),AttributeRelation.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/AttributeService.java b/web/src/main/java/com/ibeetl/jlw/service/AttributeService.java index 2075a363..4adbdef9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/AttributeService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/AttributeService.java @@ -1,13 +1,11 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.AttributeDao; -import com.ibeetl.jlw.entity.Attribute; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.AttributeDao; +import com.ibeetl.jlw.entity.Attribute; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,7 +44,7 @@ public class AttributeService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.attribute.getAttributeValues",Attribute.class,paras); + return sqlManager.select(SqlId.of("jlw.attribute.getAttributeValues"),Attribute.class,paras); } static Integer childrenCount = 0; diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionNewsService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionNewsService.java index ca73c290..29b036e9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionNewsService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionNewsService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.CompetitionNewsDao; -import com.ibeetl.jlw.entity.CompetitionNews; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.CompetitionNewsDao; +import com.ibeetl.jlw.entity.CompetitionNews; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -53,6 +52,6 @@ public class CompetitionNewsService extends CoreBaseService{ public List getValues (Object paras){ - return sqlManager.select("jlw.competitionNews.getCompetitionNewsValues",CompetitionNews.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionNews.getCompetitionNewsValues"),CompetitionNews.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java index 9753016d..013ca379 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionService.java @@ -14,6 +14,7 @@ import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.query.*; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -89,7 +90,7 @@ public class CompetitionService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.competition.getCompetitionValues",Competition.class,paras); + return sqlManager.select(SqlId.of("jlw.competition.getCompetitionValues"),Competition.class,paras); } public JsonResult add(CompetitionQuery competitionQuery){ @@ -97,7 +98,7 @@ public class CompetitionService extends CoreBaseService{ competitionQuery.setCompetitionStatus(2);//默认禁用 Competition competition = competitionQuery.pojo(); - competitionDao.insert(competition,true); + competitionDao.insert(competition); //参赛学生 diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionStudentsService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionStudentsService.java index e7e5b2a0..7f4302c1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionStudentsService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionStudentsService.java @@ -13,6 +13,7 @@ import com.ibeetl.jlw.entity.StudentDirectMessages; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.CompetitionStudentsQuery; import com.ibeetl.jlw.web.query.StudentDirectMessagesQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -265,7 +266,7 @@ public class CompetitionStudentsService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.competitionStudents.getCompetitionStudentsValues",CompetitionStudents.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionStudents.getCompetitionStudentsValues"),CompetitionStudents.class,paras); } public List getValuesByQuery (CompetitionStudentsQuery competitionStudentsQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskOneQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskOneQuestionService.java index a4e2543d..dc2a8983 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskOneQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskOneQuestionService.java @@ -1,14 +1,12 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.CompetitionTaskOneQuestionDao; -import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.CompetitionTaskOneQuestionDao; +import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,7 +55,7 @@ public class CompetitionTaskOneQuestionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.competitionTaskOneQuestion.getCompetitionTaskOneQuestionValues",CompetitionTaskOneQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionTaskOneQuestion.getCompetitionTaskOneQuestionValues"),CompetitionTaskOneQuestion.class,paras); } public List getValuesByQuery (CompetitionTaskOneQuestionQuery competitionTaskOneQuestionQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionService.java index e744266c..d35c1015 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionService.java @@ -1,21 +1,17 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.CompetitionTaskSecondQuestionDao; -import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; +import com.ibeetl.jlw.dao.CompetitionTaskSecondQuestionDao; +import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestion; import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.util.List; @@ -62,7 +58,7 @@ public class CompetitionTaskSecondQuestionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.competitionTaskSecondQuestion.getCompetitionTaskSecondQuestionValues",CompetitionTaskSecondQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionTaskSecondQuestion.getCompetitionTaskSecondQuestionValues"),CompetitionTaskSecondQuestion.class,paras); } public ListgetValuesByQuery(CompetitionTaskSecondQuestionQuery competitionTaskSecondQuestionQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionStepService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionStepService.java index b76d1a41..bead84ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionStepService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTaskSecondQuestionStepService.java @@ -1,18 +1,12 @@ package com.ibeetl.jlw.service; -import cn.jlw.util.ToolUtils; -import com.ibeetl.jlw.dao.CompetitionTaskSecondQuestionStepDao; -import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; -import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestionStep; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.jlw.web.query.CompetitionTaskOneQuestionQuery; -import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionQuery; +import com.ibeetl.jlw.dao.CompetitionTaskSecondQuestionStepDao; +import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestionStep; import com.ibeetl.jlw.web.query.CompetitionTaskSecondQuestionStepQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,7 +61,7 @@ public class CompetitionTaskSecondQuestionStepService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.competitionTaskSecondQuestionStep.getCompetitionTaskSecondQuestionStepValues",CompetitionTaskSecondQuestionStep.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionTaskSecondQuestionStep.getCompetitionTaskSecondQuestionStepValues"),CompetitionTaskSecondQuestionStep.class,paras); } public List getValuesByQuery (CompetitionTaskSecondQuestionStepQuery competitionTaskSecondQuestionStepQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTeacherEvaluationService.java b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTeacherEvaluationService.java index 7271f616..2271fff3 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CompetitionTeacherEvaluationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CompetitionTeacherEvaluationService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.CompetitionTeacherEvaluationDao; -import com.ibeetl.jlw.entity.CompetitionTeacherEvaluation; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.CompetitionTeacherEvaluationDao; +import com.ibeetl.jlw.entity.CompetitionTeacherEvaluation; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class CompetitionTeacherEvaluationService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.competitionTeacherEvaluation.getCompetitionTeacherEvaluationValues",CompetitionTeacherEvaluation.class,paras); + return sqlManager.select(SqlId.of("jlw.competitionTeacherEvaluation.getCompetitionTeacherEvaluationValues"),CompetitionTeacherEvaluation.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index 5db8c3f0..1ef2b92a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackagePartName; import org.apache.poi.xwpf.usermodel.*; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -194,7 +195,7 @@ public class CourseInfoService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.courseInfo.getValues",CourseInfo.class,paras); + return sqlManager.select(SqlId.of("jlw.courseInfo.getValues"),CourseInfo.class,paras); } public List getValues (CourseInfoQuery courseInfoQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseLabelService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseLabelService.java index 2c8e975a..09194637 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseLabelService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseLabelService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.CourseLabelDao; -import com.ibeetl.jlw.entity.CourseLabel; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.CourseLabelDao; +import com.ibeetl.jlw.entity.CourseLabel; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class CourseLabelService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.courseLabel.getCourseLabelValues",CourseLabel.class,paras); + return sqlManager.select(SqlId.of("jlw.courseLabel.getCourseLabelValues"),CourseLabel.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamService.java index 9acd07a9..1fe3fecf 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamService.java @@ -13,6 +13,7 @@ import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.query.*; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -89,7 +90,7 @@ public class ExamService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.exam.getExamValues",Exam.class,paras); + return sqlManager.select(SqlId.of("jlw.exam.getExamValues"),Exam.class,paras); } @@ -115,7 +116,7 @@ public class ExamService extends CoreBaseService{ examQuery.setExamStatus(2);//默认禁用 Exam exam = examQuery.pojo(); - examDao.insert(exam,true); + examDao.insert(exam); //参赛学生 diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamStudentsService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamStudentsService.java index ade07908..af766465 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamStudentsService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamStudentsService.java @@ -1,20 +1,19 @@ package com.ibeetl.jlw.service; +import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.service.CorePlatformService; +import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.ExamStudentsDao; import com.ibeetl.jlw.entity.ExamStudents; - - - -import com.ibeetl.admin.core.service.CoreBaseService; -import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.ExamStudentsQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -63,7 +62,7 @@ public class ExamStudentsService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.examStudents.getExamStudentsValues",ExamStudents.class,paras); + return sqlManager.select(SqlId.of("jlw.examStudents.getExamStudentsValues"),ExamStudents.class,paras); } public List getExamInfo (ExamStudentsQuery examStudentsQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskOneQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskOneQuestionService.java index 5286101a..bd3802d1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskOneQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskOneQuestionService.java @@ -1,15 +1,12 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.ExamTaskOneQuestionDao; -import com.ibeetl.jlw.entity.CompetitionTaskOneQuestion; -import com.ibeetl.jlw.entity.ExamTaskOneQuestion; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ExamTaskOneQuestionDao; +import com.ibeetl.jlw.entity.ExamTaskOneQuestion; import com.ibeetl.jlw.web.query.ExamTaskOneQuestionQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,7 +63,7 @@ public class ExamTaskOneQuestionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.examTaskOneQuestion.getExamTaskOneQuestionValues",ExamTaskOneQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.examTaskOneQuestion.getExamTaskOneQuestionValues"),ExamTaskOneQuestion.class,paras); } public List getValuesByQuery(ExamTaskOneQuestionQuery examTaskOneQuestionQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionService.java index ed7a3b7c..021eaf78 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.ExamTaskSecondQuestionDao; -import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ExamTaskSecondQuestionDao; +import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -62,6 +61,6 @@ public class ExamTaskSecondQuestionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.examTaskSecondQuestion.getExamTaskSecondQuestionValues",ExamTaskSecondQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.examTaskSecondQuestion.getExamTaskSecondQuestionValues"),ExamTaskSecondQuestion.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionStepService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionStepService.java index ac928ddc..03e45732 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionStepService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskSecondQuestionStepService.java @@ -1,17 +1,12 @@ package com.ibeetl.jlw.service; -import cn.jlw.util.ToolUtils; -import com.ibeetl.jlw.dao.ExamTaskSecondQuestionStepDao; -import com.ibeetl.jlw.entity.CompetitionTaskSecondQuestionStep; -import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; -import com.ibeetl.jlw.entity.ExamTaskSecondQuestionStep; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ExamTaskSecondQuestionStepDao; +import com.ibeetl.jlw.entity.ExamTaskSecondQuestionStep; import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,7 +57,7 @@ public class ExamTaskSecondQuestionStepService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.examTaskSecondQuestionStep.getExamTaskSecondQuestionStepValues",ExamTaskSecondQuestionStep.class,paras); + return sqlManager.select(SqlId.of("jlw.examTaskSecondQuestionStep.getExamTaskSecondQuestionStepValues"),ExamTaskSecondQuestionStep.class,paras); } public List getValuesWithOutAnswer (ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionService.java index c2098b25..041ff7f7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionService.java @@ -1,18 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.ExamTaskThreeQuestionDao; -import com.ibeetl.jlw.entity.ExamTaskSecondQuestion; -import com.ibeetl.jlw.entity.ExamTaskThreeQuestion; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ExamTaskThreeQuestionDao; +import com.ibeetl.jlw.entity.ExamTaskThreeQuestion; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -63,6 +61,6 @@ public class ExamTaskThreeQuestionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.examTaskThreeQuestion.getExamTaskThreeQuestionValues",ExamTaskThreeQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.examTaskThreeQuestion.getExamTaskThreeQuestionValues"),ExamTaskThreeQuestion.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionStepService.java b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionStepService.java index f105f820..ccdea03e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionStepService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ExamTaskThreeQuestionStepService.java @@ -1,18 +1,12 @@ package com.ibeetl.jlw.service; -import cn.jlw.util.ToolUtils; -import com.ibeetl.jlw.dao.ExamTaskThreeQuestionStepDao; -import com.ibeetl.jlw.entity.ExamTaskSecondQuestionStep; -import com.ibeetl.jlw.entity.ExamTaskThreeQuestion; -import com.ibeetl.jlw.entity.ExamTaskThreeQuestionStep; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; -import com.ibeetl.jlw.web.query.ExamTaskSecondQuestionStepQuery; +import com.ibeetl.jlw.dao.ExamTaskThreeQuestionStepDao; +import com.ibeetl.jlw.entity.ExamTaskThreeQuestionStep; import com.ibeetl.jlw.web.query.ExamTaskThreeQuestionStepQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,7 +57,7 @@ public class ExamTaskThreeQuestionStepService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.examTaskThreeQuestionStep.getExamTaskThreeQuestionStepValues",ExamTaskThreeQuestionStep.class,paras); + return sqlManager.select(SqlId.of("jlw.examTaskThreeQuestionStep.getExamTaskThreeQuestionStepValues"),ExamTaskThreeQuestionStep.class,paras); } public List getValuesWithOutAnswer(ExamTaskThreeQuestionStepQuery examTaskThreeQuestionStepQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/IpAddressService.java b/web/src/main/java/com/ibeetl/jlw/service/IpAddressService.java index cc35eefd..34b173e1 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/IpAddressService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/IpAddressService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.IpAddressDao; -import com.ibeetl.jlw.entity.IpAddress; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.IpAddressDao; +import com.ibeetl.jlw.entity.IpAddress; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class IpAddressService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.ipAddress.getIpAddressValues",IpAddress.class,paras); + return sqlManager.select(SqlId.of("jlw.ipAddress.getIpAddressValues"),IpAddress.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationCourseService.java index 54ca1c80..8ab5c8b9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationCourseService.java @@ -1,14 +1,12 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao; -import com.ibeetl.jlw.entity.ResourcesApplicationCourse; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao; +import com.ibeetl.jlw.entity.ResourcesApplicationCourse; import com.ibeetl.jlw.web.query.ResourcesApplicationCourseQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,6 +63,6 @@ public class ResourcesApplicationCourseService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.resourcesApplicationCourse.getResourcesApplicationCourseValues",ResourcesApplicationCourse.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesApplicationCourse.getResourcesApplicationCourseValues"),ResourcesApplicationCourse.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java index f968b450..e0643606 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java @@ -7,6 +7,7 @@ import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao; import com.ibeetl.jlw.dao.ResourcesApplicationDao; import com.ibeetl.jlw.entity.ResourcesApplication; import com.ibeetl.jlw.web.query.ResourcesApplicationQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -127,6 +128,6 @@ public class ResourcesApplicationService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.resourcesApplication.getResourcesApplicationValues",ResourcesApplication.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesApplication.getResourcesApplicationValues"),ResourcesApplication.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionService.java index 9054ca7f..9c72813d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionService.java @@ -9,6 +9,7 @@ import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesCompetitionQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,7 +53,7 @@ public class ResourcesCompetitionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.resourcesCompetition.getResourcesCompetitionValues",ResourcesCompetition.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesCompetition.getResourcesCompetitionValues"),ResourcesCompetition.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionStepService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionStepService.java index 8b16f024..d7bf5683 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionStepService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesCompetitionStepService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.ResourcesCompetitionStepDao; -import com.ibeetl.jlw.entity.ResourcesCompetitionStep; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.ResourcesCompetitionStepDao; +import com.ibeetl.jlw.entity.ResourcesCompetitionStep; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -48,6 +47,6 @@ public class ResourcesCompetitionStepService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.resourcesCompetitionStep.getResourcesCompetitionStepValues",ResourcesCompetitionStep.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesCompetitionStep.getResourcesCompetitionStepValues"),ResourcesCompetitionStep.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java index c7696ed1..0b60e30a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java @@ -9,6 +9,7 @@ import com.ibeetl.jlw.dao.ResourcesInfoDao; import com.ibeetl.jlw.entity.CourseInfo; import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.web.query.ResourcesInfoQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -265,6 +266,6 @@ public class ResourcesInfoService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.resourcesInfo.getResourcesInfoValues",ResourcesInfo.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesInfo.getResourcesInfoValues"),ResourcesInfo.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java index 140d4cac..316266f3 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java @@ -22,6 +22,7 @@ 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.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -73,7 +74,7 @@ public class ResourcesQuestionService extends CoreBaseService public boolean add (ResourcesQuestion resourcesQuestion){ resourcesQuestion.setQuestionStatus(1); - resourcesQuestionDao.insert(resourcesQuestion,true); + resourcesQuestionDao.insert(resourcesQuestion); CourseInfo courseInfo = courseInfoDao.single(resourcesQuestion.getCourseInfoId()); @@ -135,7 +136,7 @@ public class ResourcesQuestionService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.resourcesQuestion.getResourcesQuestionValues",ResourcesQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesQuestion.getResourcesQuestionValues"),ResourcesQuestion.class,paras); } public List getTreeByCourseLabelTypes(String courseLabelTypes) { diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingService.java index d770a373..704e6645 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingService.java @@ -12,6 +12,7 @@ import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesTrainingQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,7 +56,7 @@ public class ResourcesTrainingService extends CoreBaseService public boolean add (ResourcesTraining resourcesTraining){ - resourcesTrainingDao.insert(resourcesTraining,true); + resourcesTrainingDao.insert(resourcesTraining); CourseInfo courseInfo = courseInfoDao.single(resourcesTraining.getCourseInfoId()); @@ -254,6 +255,6 @@ public class ResourcesTrainingService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.resourcesTraining.getResourcesTrainingValues",ResourcesTraining.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesTraining.getResourcesTrainingValues"),ResourcesTraining.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingStepService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingStepService.java index bf27f894..a9f1c21c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingStepService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesTrainingStepService.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.ResourcesTrainingStepDao; import com.ibeetl.jlw.entity.ResourcesTrainingStep; import com.ibeetl.jlw.web.query.ResourcesTrainingStepQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,7 +48,7 @@ public class ResourcesTrainingStepService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.resourcesTrainingStep.getResourcesTrainingStepValues",ResourcesTrainingStep.class,paras); + return sqlManager.select(SqlId.of("jlw.resourcesTrainingStep.getResourcesTrainingStepValues"),ResourcesTrainingStep.class,paras); } public List getValuesByQuery (ResourcesTrainingStepQuery resourcesTrainingStepQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index 41683c1a..a65b24a5 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -1,18 +1,17 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.SchoolClassDao; -import com.ibeetl.jlw.entity.SchoolClass; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.SchoolClassDao; +import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.web.query.SchoolClassQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -45,7 +44,7 @@ public class SchoolClassService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.schoolClass.getSchoolClassValues",SchoolClass.class,paras); + return sqlManager.select(SqlId.of("jlw.schoolClass.getSchoolClassValues"),SchoolClass.class,paras); } public List getValuesByQuery (SchoolClassQuery schoolClassQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java index df9c6e1a..8c1f4533 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.StudentClientLinkDao; import com.ibeetl.jlw.entity.StudentClientLink; import com.ibeetl.jlw.web.query.StudentClientLinkQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class StudentClientLinkService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.studentClientLink.getStudentClientLinkValues",StudentClientLink.class,paras); + return sqlManager.select(SqlId.of("jlw.studentClientLink.getStudentClientLinkValues"),StudentClientLink.class,paras); } public List getValuesByQuery (StudentClientLinkQuery studentClientLinkQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogInfoService.java index 322ca4b9..94914278 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogInfoService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.StudentDefenceLogInfoDao; -import com.ibeetl.jlw.entity.StudentDefenceLogInfo; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.StudentDefenceLogInfoDao; +import com.ibeetl.jlw.entity.StudentDefenceLogInfo; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -48,6 +47,6 @@ public class StudentDefenceLogInfoService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentDefenceLogInfo.getStudentDefenceLogInfoValues",StudentDefenceLogInfo.class,paras); + return sqlManager.select(SqlId.of("jlw.studentDefenceLogInfo.getStudentDefenceLogInfoValues"),StudentDefenceLogInfo.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogNoteService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogNoteService.java index f53e9ba7..b30ab607 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogNoteService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogNoteService.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.StudentDefenceLogNoteDao; import com.ibeetl.jlw.entity.StudentDefenceLogNote; import com.ibeetl.jlw.web.query.StudentDefenceLogNoteQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,7 +44,7 @@ public class StudentDefenceLogNoteService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentDefenceLogNote.getStudentDefenceLogNoteValues",StudentDefenceLogNote.class,paras); + return sqlManager.select(SqlId.of("jlw.studentDefenceLogNote.getStudentDefenceLogNoteValues"),StudentDefenceLogNote.class,paras); } public List getValuesByQuery (StudentDefenceLogNoteQuery studentDefenceLogNoteQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogService.java index 11b5443f..5700eb31 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentDefenceLogService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.StudentDefenceLogDao; -import com.ibeetl.jlw.entity.StudentDefenceLog; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.StudentDefenceLogDao; +import com.ibeetl.jlw.entity.StudentDefenceLog; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class StudentDefenceLogService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.studentDefenceLog.getStudentDefenceLogValues",StudentDefenceLog.class,paras); + return sqlManager.select(SqlId.of("jlw.studentDefenceLog.getStudentDefenceLogValues"),StudentDefenceLog.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentDirectMessagesService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentDirectMessagesService.java index ed901a92..042c2bca 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentDirectMessagesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentDirectMessagesService.java @@ -1,14 +1,11 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.StudentDirectMessagesDao; -import com.ibeetl.jlw.entity.CourseInfo; -import com.ibeetl.jlw.entity.StudentDirectMessages; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.StudentDirectMessagesDao; +import com.ibeetl.jlw.entity.StudentDirectMessages; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -93,6 +90,6 @@ public class StudentDirectMessagesService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentDirectMessages.getStudentDirectMessagesValues",StudentDirectMessages.class,paras); + return sqlManager.select(SqlId.of("jlw.studentDirectMessages.getStudentDirectMessagesValues"),StudentDirectMessages.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogAnswerService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogAnswerService.java index 5c111099..490fa65e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogAnswerService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogAnswerService.java @@ -1,19 +1,18 @@ package com.ibeetl.jlw.service; -import java.util.List; -import java.util.Map; - +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.StudentQuestionLogAnswerDao; import com.ibeetl.jlw.entity.StudentQuestionLogAnswer; import com.ibeetl.jlw.web.query.StudentQuestionLogAnswerQuery; - -import com.ibeetl.admin.core.service.CoreBaseService; -import com.ibeetl.admin.core.util.PlatformException; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * StudentQuestionLogAnswer Service @@ -40,7 +39,7 @@ public class StudentQuestionLogAnswerService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentQuestionLogAnswer.getStudentQuestionLogAnswerValues",StudentQuestionLogAnswer.class,paras); + return sqlManager.select(SqlId.of("jlw.studentQuestionLogAnswer.getStudentQuestionLogAnswerValues"),StudentQuestionLogAnswer.class,paras); } public List getValuesByQuery (StudentQuestionLogAnswerQuery studentQuestionLogAnswerQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogInfoService.java index 1eeb00f2..79ef603b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogInfoService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.StudentQuestionLogInfoDao; -import com.ibeetl.jlw.entity.StudentQuestionLogInfo; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.StudentQuestionLogInfoDao; +import com.ibeetl.jlw.entity.StudentQuestionLogInfo; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class StudentQuestionLogInfoService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentQuestionLogInfo.getStudentQuestionLogInfoValues",StudentQuestionLogInfo.class,paras); + return sqlManager.select(SqlId.of("jlw.studentQuestionLogInfo.getStudentQuestionLogInfoValues"),StudentQuestionLogInfo.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogService.java index 8387edad..a0110ac6 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentQuestionLogService.java @@ -1,17 +1,16 @@ package com.ibeetl.jlw.service; -import com.ibeetl.jlw.dao.StudentQuestionLogDao; -import com.ibeetl.jlw.entity.StudentQuestionLog; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.StudentQuestionLogDao; +import com.ibeetl.jlw.entity.StudentQuestionLog; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -44,6 +43,6 @@ public class StudentQuestionLogService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.studentQuestionLog.getStudentQuestionLogValues",StudentQuestionLog.class,paras); + return sqlManager.select(SqlId.of("jlw.studentQuestionLog.getStudentQuestionLogValues"),StudentQuestionLog.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index d142951e..9b6947a5 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -23,6 +23,7 @@ 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.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -641,7 +642,7 @@ public class StudentService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.student.getStudentValues",Student.class,paras); + return sqlManager.select(SqlId.of("jlw.student.getStudentValues"),Student.class,paras); } public List getValuesByQuery (StudentQuery studentQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/SysLogService.java b/web/src/main/java/com/ibeetl/jlw/service/SysLogService.java index 6dd1cd74..16c96708 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SysLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SysLogService.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.SysLogDao; import com.ibeetl.jlw.entity.SysLog; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,7 +62,7 @@ public class SysLogService extends CoreBaseService { }else { sysLog.setResult(null); } - sysLogDao.insert(sysLog, true); + sysLogDao.insert(sysLog); if (result.getBytes().length < 65535) { sysLogDao.saveToText(sysLog.getId(), null, result); } else if (result.getBytes().length < 16777215) { @@ -71,7 +72,7 @@ public class SysLogService extends CoreBaseService { } } else if (params.getBytes().length >= 5000 && result.getBytes().length < 10000) { sysLog.setParams(null); - sysLogDao.insert(sysLog, true); + sysLogDao.insert(sysLog); if (params.getBytes().length < 65535) { sysLogDao.saveToText(sysLog.getId(), params, null); } else if (params.getBytes().length < 16777215) { @@ -106,7 +107,7 @@ public class SysLogService extends CoreBaseService { } public List getValues(Object paras) { - return sqlManager.select("jlw.sysLog.getSysLogValues", SysLog.class, paras); + return sqlManager.select(SqlId.of("jlw.sysLog.getSysLogValues"), SysLog.class, paras); } public List> onLineNum(Date startTime, Date endTime) { diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java index 3ce4039c..ed16055f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.TeacherMergeApplicationDao; import com.ibeetl.jlw.entity.TeacherMergeApplication; import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class TeacherMergeApplicationService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.teacherMergeApplication.getTeacherMergeApplicationValues",TeacherMergeApplication.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherMergeApplication.getTeacherMergeApplicationValues"),TeacherMergeApplication.class,paras); } public List getValuesByQuery (TeacherMergeApplicationQuery teacherMergeApplicationQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeSchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeSchoolClassService.java index 33331d80..1648e152 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeSchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeSchoolClassService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.TeacherMergeSchoolClassDao; import com.ibeetl.jlw.entity.TeacherMergeSchoolClass; import com.ibeetl.jlw.web.query.TeacherMergeSchoolClassQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -119,7 +120,7 @@ public class TeacherMergeSchoolClassService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.teacherMergeSchoolClass.getTeacherMergeSchoolClassValues",TeacherMergeSchoolClass.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherMergeSchoolClass.getTeacherMergeSchoolClassValues"),TeacherMergeSchoolClass.class,paras); } public List getValuesByQuery (TeacherMergeSchoolClassQuery teacherMergeSchoolClassQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java index 7d66473e..02545651 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseMergeTeacherDao; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class TeacherOpenCourseMergeTeacherService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.teacherOpenCourseMergeTeacher.getTeacherOpenCourseMergeTeacherValues",TeacherOpenCourseMergeTeacher.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseMergeTeacher.getTeacherOpenCourseMergeTeacherValues"),TeacherOpenCourseMergeTeacher.class,paras); } public List getValuesByQuery (TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionClassService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionClassService.java index dc5be517..207f8467 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionClassService.java @@ -12,6 +12,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionClassDao; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionClass; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -121,7 +122,7 @@ public class TeacherOpenCourseScheduleSessionClassService extends CoreBaseServic } public List getValues (Object paras){ - return sqlManager.select("jlw.teacherOpenCourseScheduleSessionClass.getTeacherOpenCourseScheduleSessionClassValues",TeacherOpenCourseScheduleSessionClass.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseScheduleSessionClass.getTeacherOpenCourseScheduleSessionClassValues"),TeacherOpenCourseScheduleSessionClass.class,paras); } public List getValuesByQuery (TeacherOpenCourseScheduleSessionClassQuery teacherOpenCourseScheduleSessionClassQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java index f6ddae27..bcf3d160 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java @@ -22,6 +22,7 @@ import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -132,7 +133,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.teacherOpenCourseScheduleSession.getTeacherOpenCourseScheduleSessionValues",TeacherOpenCourseScheduleSession.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseScheduleSession.getTeacherOpenCourseScheduleSessionValues"),TeacherOpenCourseScheduleSession.class,paras); } public List getValuesByQuery (TeacherOpenCourseScheduleSessionQuery teacherOpenCourseScheduleSessionQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java index 8d9bf8a4..10fa803f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionTagDao; import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag; import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -119,7 +120,7 @@ public class TeacherOpenCourseScheduleSessionTagService extends CoreBaseService< } public List getValues (Object paras){ - return sqlManager.select("jlw.teacherOpenCourseScheduleSessionTag.getTeacherOpenCourseScheduleSessionTagValues",TeacherOpenCourseScheduleSessionTag.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherOpenCourseScheduleSessionTag.getTeacherOpenCourseScheduleSessionTagValues"),TeacherOpenCourseScheduleSessionTag.class,paras); } public List getValuesByQuery (TeacherOpenCourseScheduleSessionTagQuery teacherOpenCourseScheduleSessionTagQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java index 5ce8e923..a49b2c72 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java @@ -15,6 +15,7 @@ import com.ibeetl.jlw.entity.TeacherOpenCourse; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -142,7 +143,7 @@ public class TeacherOpenCourseService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.teacherOpenCourse.getTeacherOpenCourseValues",TeacherOpenCourse.class,paras); + return sqlManager.select(SqlId.of("jlw.teacherOpenCourse.getTeacherOpenCourseValues"),TeacherOpenCourse.class,paras); } public List getValuesByQuery (TeacherOpenCourseQuery teacherOpenCourseQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index 2306228f..b76296b8 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -23,6 +23,7 @@ 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.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.jsoup.Jsoup; import org.jsoup.nodes.Attributes; @@ -475,7 +476,7 @@ public class TeacherService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.teacher.getTeacherValues",Teacher.class,paras); + return sqlManager.select(SqlId.of("jlw.teacher.getTeacherValues"),Teacher.class,paras); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java index 4b46a577..44418fbb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionCurriculumResourcesService.java @@ -1,19 +1,17 @@ package com.ibeetl.jlw.service; -import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; -import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; - - - import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; +import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; @@ -58,6 +56,6 @@ public class UniversitiesCollegesJurisdictionCurriculumResourcesService extends } public List getValues (Object paras){ - return sqlManager.select("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues",UniversitiesCollegesJurisdictionCurriculumResources.class,paras); + return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionCurriculumResources.getUniversitiesCollegesJurisdictionCurriculumResourcesValues"),UniversitiesCollegesJurisdictionCurriculumResources.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java index 5321a2f5..c26ef766 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesJurisdictionExperimentalSystemService.java @@ -1,22 +1,19 @@ package com.ibeetl.jlw.service; -import cn.jlw.aliPay.utils.StringUtils; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionExperimentalSystem; - - - -import com.ibeetl.admin.core.service.CoreBaseService; -import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -144,6 +141,6 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemService extends C } public List getValues (Object paras){ - return sqlManager.select("jlw.universitiesCollegesJurisdictionExperimentalSystem.getUniversitiesCollegesJurisdictionExperimentalSystemValues",UniversitiesCollegesJurisdictionExperimentalSystem.class,paras); + return sqlManager.select(SqlId.of("jlw.universitiesCollegesJurisdictionExperimentalSystem.getUniversitiesCollegesJurisdictionExperimentalSystemValues"),UniversitiesCollegesJurisdictionExperimentalSystem.class,paras); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java index 777787c3..6a6c2c6f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java @@ -10,6 +10,7 @@ import com.ibeetl.jlw.entity.SchoolClass; import com.ibeetl.jlw.entity.UniversitiesColleges; import com.ibeetl.jlw.web.query.SchoolClassQuery; import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,7 +58,7 @@ public class UniversitiesCollegesService extends CoreBaseService getValues (Object paras){ - return sqlManager.select("jlw.universitiesColleges.getUniversitiesCollegesValues",UniversitiesColleges.class,paras); + return sqlManager.select(SqlId.of("jlw.universitiesColleges.getUniversitiesCollegesValues"),UniversitiesColleges.class,paras); } public List getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java index 33cf29da..f0395f9d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.UniversityFacultyDao; import com.ibeetl.jlw.entity.UniversityFaculty; import com.ibeetl.jlw.web.query.UniversityFacultyQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class UniversityFacultyService extends CoreBaseService } public List getValues (Object paras){ - return sqlManager.select("jlw.universityFaculty.getUniversityFacultyValues",UniversityFaculty.class,paras); + return sqlManager.select(SqlId.of("jlw.universityFaculty.getUniversityFacultyValues"),UniversityFaculty.class,paras); } public List getValuesByQuery (UniversityFacultyQuery universityFacultyQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java index bc71cd0a..35ebb981 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java @@ -11,6 +11,7 @@ import com.ibeetl.jlw.dao.UniversitySystemDao; import com.ibeetl.jlw.entity.UniversitySystem; import com.ibeetl.jlw.web.query.UniversitySystemQuery; import org.apache.commons.lang3.StringUtils; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -117,7 +118,7 @@ public class UniversitySystemService extends CoreBaseService{ } public List getValues (Object paras){ - return sqlManager.select("jlw.universitySystem.getUniversitySystemValues",UniversitySystem.class,paras); + return sqlManager.select(SqlId.of("jlw.universitySystem.getUniversitySystemValues"),UniversitySystem.class,paras); } public List getValuesByQuery (UniversitySystemQuery universitySystemQuery){ diff --git a/web/src/main/java/com/ibeetl/jlw/service/WrongQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/WrongQuestionService.java index fecefb77..1c5d34e7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/WrongQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/WrongQuestionService.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.jlw.dao.WrongQuestionDao; import com.ibeetl.jlw.entity.WrongQuestion; import com.ibeetl.jlw.web.query.WrongQuestionQuery; +import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class WrongQuestionService extends CoreBaseService{ public List getValues (Object paras){ - return sqlManager.select("jlw.wrongQuestion.getWrongQuestionValues",WrongQuestion.class,paras); + return sqlManager.select(SqlId.of("jlw.wrongQuestion.getWrongQuestionValues"),WrongQuestion.class,paras); } //获取上一错题、当前错题、下一错题的数据 diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index fe7b5df8..f0651f45 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -38,7 +38,7 @@ server.max-http-header-size=102400 server.servlet.context-path=/server server.port=9090 server.tomcat.accesslog.buffered=true -server.tomcat.accesslog.directory=E:\\pro\\admin\\tomcatLogs +server.tomcat.accesslog.directory= server.tomcat.accesslog.enabled=true server.tomcat.accesslog.file-date-format=.yyyy-MM-dd server.tomcat.accesslog.pattern=common