From 1597afbfe1825647ea177afb4495da505b263a4e Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Thu, 16 Dec 2021 21:59:51 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E5=90=8C=E6=AD=A52.1=E7=89=88?=
=?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../orange-demo-single-service/README.md | 2 +
.../application-common/pom.xml | 2 +-
.../common/constant/DeviceType.java | 2 +-
.../application/common/constant/ExpLevel.java | 2 +-
.../application/common/constant/Gender.java | 2 +-
.../common/constant/StudentActionType.java | 2 +-
.../common/constant/StudentStatus.java | 2 +-
.../application/common/constant/Subject.java | 2 +-
.../application-webadmin/pom.xml | 17 +-
.../webadmin/upms/dto/SysDataPermDeptDto.java | 23 --
.../demo/webadmin/upms/dto/SysDeptDto.java | 40 --
.../webadmin/WebAdminApplication.java | 4 +-
.../app/controller/AreaCodeController.java | 12 +-
.../app/controller/CourseController.java | 58 ++-
.../CourseTransStatsController.java | 20 +-
.../app/controller/GradeController.java | 28 +-
.../StudentActionStatsController.java | 20 +-
.../StudentActionTransController.java | 38 +-
.../controller/StudentClassController.java | 54 +--
.../app/controller/StudentController.java | 44 +-
.../webadmin/app/dao/AreaCodeMapper.java | 6 +-
.../webadmin/app/dao/ClassCourseMapper.java | 6 +-
.../webadmin/app/dao/ClassStudentMapper.java | 6 +-
.../webadmin/app/dao/CourseMapper.java | 6 +-
.../app/dao/CourseTransStatsMapper.java | 6 +-
.../webadmin/app/dao/GradeMapper.java | 6 +-
.../app/dao/MaterialEditionMapper.java | 6 +-
.../app/dao/StudentActionStatsMapper.java | 6 +-
.../app/dao/StudentActionTransMapper.java | 6 +-
.../webadmin/app/dao/StudentClassMapper.java | 6 +-
.../webadmin/app/dao/StudentMapper.java | 6 +-
.../app/dao/mapper/AreaCodeMapper.xml | 4 +-
.../app/dao/mapper/ClassCourseMapper.xml | 4 +-
.../app/dao/mapper/ClassStudentMapper.xml | 4 +-
.../webadmin/app/dao/mapper/CourseMapper.xml | 12 +-
.../app/dao/mapper/CourseTransStatsMapper.xml | 10 +-
.../webadmin/app/dao/mapper/GradeMapper.xml | 4 +-
.../app/dao/mapper/MaterialEditionMapper.xml | 4 +-
.../dao/mapper/StudentActionStatsMapper.xml | 10 +-
.../dao/mapper/StudentActionTransMapper.xml | 8 +-
.../app/dao/mapper/StudentClassMapper.xml | 10 +-
.../webadmin/app/dao/mapper/StudentMapper.xml | 8 +-
.../webadmin/app/dto/ClassCourseDto.java | 10 +-
.../webadmin/app/dto/ClassStudentDto.java | 9 +-
.../webadmin/app/dto/CourseDto.java | 47 ++-
.../webadmin/app/dto/CourseTransStatsDto.java | 23 +-
.../webadmin/app/dto/GradeDto.java | 9 +-
.../app/dto/StudentActionStatsDto.java | 30 +-
.../app/dto/StudentActionTransDto.java | 31 +-
.../webadmin/app/dto/StudentClassDto.java | 31 +-
.../webadmin/app/dto/StudentDto.java | 40 +-
.../webadmin/app/model/AreaCode.java | 2 +-
.../webadmin/app/model/ClassCourse.java | 2 +-
.../webadmin/app/model/ClassStudent.java | 2 +-
.../webadmin/app/model/Course.java | 18 +-
.../webadmin/app/model/CourseTransStats.java | 11 +-
.../webadmin/app/model/Grade.java | 2 +-
.../webadmin/app/model/MaterialEdition.java | 2 +-
.../webadmin/app/model/Student.java | 19 +-
.../app/model/StudentActionStats.java | 8 +-
.../app/model/StudentActionTrans.java | 15 +-
.../webadmin/app/model/StudentClass.java | 13 +-
.../app/model/constant/ClassLevel.java | 2 +-
.../app/model/constant/ClassStatus.java | 2 +-
.../app/model/constant/CourseDifficult.java | 2 +-
.../webadmin/app/service/AreaCodeService.java | 6 +-
.../webadmin/app/service/CourseService.java | 16 +-
.../app/service/CourseTransStatsService.java | 6 +-
.../webadmin/app/service/GradeService.java | 6 +-
.../service/StudentActionStatsService.java | 6 +-
.../service/StudentActionTransService.java | 16 +-
.../app/service/StudentClassService.java | 16 +-
.../webadmin/app/service/StudentService.java | 16 +-
.../app/service/impl/AreaCodeServiceImpl.java | 14 +-
.../app/service/impl/CourseServiceImpl.java | 20 +-
.../impl/CourseTransStatsServiceImpl.java | 14 +-
.../app/service/impl/GradeServiceImpl.java | 14 +-
.../impl/StudentActionStatsServiceImpl.java | 14 +-
.../impl/StudentActionTransServiceImpl.java | 20 +-
.../service/impl/StudentClassServiceImpl.java | 26 +-
.../app/service/impl/StudentServiceImpl.java | 24 +-
.../webadmin/app/vo/AreaCodeVo.java | 9 +-
.../webadmin/app/vo/ClassCourseVo.java | 8 +-
.../webadmin/app/vo/ClassStudentVo.java | 7 +-
.../webadmin/app/vo/CourseTransStatsVo.java | 17 +-
.../webadmin/app/vo/CourseVo.java | 21 +-
.../webadmin/app/vo/GradeVo.java | 7 +-
.../webadmin/app/vo/StudentActionStatsVo.java | 29 +-
.../webadmin/app/vo/StudentActionTransVo.java | 24 +-
.../webadmin/app/vo/StudentClassVo.java | 16 +-
.../webadmin/app/vo/StudentVo.java | 28 +-
.../webadmin/config/ApplicationConfig.java | 2 +-
.../webadmin/config/DataSourceConfig.java | 4 +-
.../webadmin/config/FilterConfig.java | 2 +-
.../webadmin/config/InterceptorConfig.java | 4 +-
.../AuthenticationInterceptor.java | 24 +-
.../upms/controller/LoginController.java | 52 ++-
.../upms/controller/LoginUserController.java | 10 +-
.../controller/SysDataPermController.java | 44 +-
.../upms/controller/SysDeptController.java | 26 +-
.../upms/controller/SysMenuController.java | 30 +-
.../controller/SysOperationLogController.java | 20 +-
.../controller/SysPermCodeController.java | 28 +-
.../upms/controller/SysPermController.java | 28 +-
.../controller/SysPermModuleController.java | 30 +-
.../upms/controller/SysRoleController.java | 68 +++-
.../upms/controller/SysUserController.java | 35 +-
.../upms/dao/SysDataPermDeptMapper.java | 6 +-
.../webadmin/upms/dao/SysDataPermMapper.java | 6 +-
.../upms/dao/SysDataPermUserMapper.java | 6 +-
.../webadmin/upms/dao/SysDeptMapper.java | 6 +-
.../upms/dao/SysDeptRelationMapper.java | 6 +-
.../webadmin/upms/dao/SysMenuMapper.java | 6 +-
.../upms/dao/SysMenuPermCodeMapper.java | 6 +-
.../webadmin/upms/dao/SysPermCodeMapper.java | 6 +-
.../upms/dao/SysPermCodePermMapper.java | 6 +-
.../webadmin/upms/dao/SysPermMapper.java | 6 +-
.../upms/dao/SysPermModuleMapper.java | 6 +-
.../upms/dao/SysPermWhitelistMapper.java | 6 +-
.../webadmin/upms/dao/SysRoleMapper.java | 6 +-
.../webadmin/upms/dao/SysRoleMenuMapper.java | 6 +-
.../webadmin/upms/dao/SysUserMapper.java | 6 +-
.../webadmin/upms/dao/SysUserRoleMapper.java | 6 +-
.../upms/dao/mapper/SysDataPermDeptMapper.xml | 4 +-
.../upms/dao/mapper/SysDataPermMapper.xml | 16 +-
.../upms/dao/mapper/SysDataPermUserMapper.xml | 4 +-
.../upms/dao/mapper/SysDeptMapper.xml | 10 +-
.../upms/dao/mapper/SysDeptRelationMapper.xml | 4 +-
.../upms/dao/mapper/SysMenuMapper.xml | 6 +-
.../upms/dao/mapper/SysMenuPermCodeMapper.xml | 4 +-
.../upms/dao/mapper/SysPermCodeMapper.xml | 4 +-
.../upms/dao/mapper/SysPermCodePermMapper.xml | 4 +-
.../upms/dao/mapper/SysPermMapper.xml | 4 +-
.../upms/dao/mapper/SysPermModuleMapper.xml | 14 +-
.../dao/mapper/SysPermWhitelistMapper.xml | 4 +-
.../upms/dao/mapper/SysRoleMapper.xml | 8 +-
.../upms/dao/mapper/SysRoleMenuMapper.xml | 4 +-
.../upms/dao/mapper/SysUserMapper.xml | 10 +-
.../upms/dao/mapper/SysUserRoleMapper.xml | 4 +-
.../webadmin/upms/dto/SysDataPermDeptDto.java | 28 ++
.../webadmin/upms/dto/SysDataPermDto.java | 16 +-
.../webadmin/upms/dto/SysDeptDto.java | 73 ++++
.../webadmin/upms/dto/SysMenuDto.java | 19 +-
.../webadmin/upms/dto/SysOperationLogDto.java | 15 +-
.../webadmin/upms/dto/SysPermCodeDto.java | 17 +-
.../webadmin/upms/dto/SysPermDto.java | 13 +-
.../webadmin/upms/dto/SysPermModuleDto.java | 16 +-
.../webadmin/upms/dto/SysRoleDto.java | 9 +-
.../webadmin/upms/dto/SysUserDto.java | 51 ++-
.../webadmin/upms/model/SysDataPerm.java | 12 +-
.../webadmin/upms/model/SysDataPermDept.java | 2 +-
.../webadmin/upms/model/SysDataPermUser.java | 2 +-
.../webadmin/upms/model/SysDept.java | 6 +-
.../webadmin/upms/model/SysDeptRelation.java | 2 +-
.../webadmin/upms/model/SysMenu.java | 10 +-
.../webadmin/upms/model/SysMenuPermCode.java | 2 +-
.../webadmin/upms/model/SysPerm.java | 4 +-
.../webadmin/upms/model/SysPermCode.java | 10 +-
.../webadmin/upms/model/SysPermCodePerm.java | 2 +-
.../webadmin/upms/model/SysPermModule.java | 2 +-
.../webadmin/upms/model/SysPermWhitelist.java | 2 +-
.../webadmin/upms/model/SysRole.java | 10 +-
.../webadmin/upms/model/SysRoleMenu.java | 2 +-
.../webadmin/upms/model/SysUser.java | 18 +-
.../webadmin/upms/model/SysUserRole.java | 2 +-
.../upms/model/constant/SysMenuType.java | 2 +-
.../model/constant/SysOnlineMenuPermType.java | 2 +-
.../upms/model/constant/SysPermCodeType.java | 2 +-
.../model/constant/SysPermModuleType.java | 2 +-
.../upms/model/constant/SysUserStatus.java | 2 +-
.../upms/model/constant/SysUserType.java | 2 +-
.../upms/service/SysDataPermService.java | 8 +-
.../webadmin/upms/service/SysDeptService.java | 6 +-
.../webadmin/upms/service/SysMenuService.java | 8 +-
.../upms/service/SysPermCodeService.java | 8 +-
.../upms/service/SysPermModuleService.java | 6 +-
.../webadmin/upms/service/SysPermService.java | 17 +-
.../upms/service/SysPermWhitelistService.java | 6 +-
.../webadmin/upms/service/SysRoleService.java | 18 +-
.../webadmin/upms/service/SysUserService.java | 8 +-
.../service/impl/SysDataPermServiceImpl.java | 32 +-
.../upms/service/impl/SysDeptServiceImpl.java | 20 +-
.../upms/service/impl/SysMenuServiceImpl.java | 34 +-
.../service/impl/SysPermCodeServiceImpl.java | 30 +-
.../impl/SysPermModuleServiceImpl.java | 22 +-
.../upms/service/impl/SysPermServiceImpl.java | 32 +-
.../impl/SysPermWhitelistServiceImpl.java | 12 +-
.../upms/service/impl/SysRoleServiceImpl.java | 37 +-
.../upms/service/impl/SysUserServiceImpl.java | 24 +-
.../webadmin/upms/vo/SysDataPermDeptVo.java | 7 +-
.../webadmin/upms/vo/SysDataPermVo.java | 14 +-
.../webadmin/upms/vo/SysDeptVo.java | 13 +-
.../webadmin/upms/vo/SysMenuVo.java | 19 +-
.../webadmin/upms/vo/SysOperationLogVo.java | 25 +-
.../webadmin/upms/vo/SysPermCodeVo.java | 16 +-
.../webadmin/upms/vo/SysPermModuleVo.java | 15 +-
.../webadmin/upms/vo/SysPermVo.java | 16 +-
.../webadmin/upms/vo/SysRoleVo.java | 12 +-
.../webadmin/upms/vo/SysUserVo.java | 21 +-
.../src/main/resources/application.yml | 17 +-
.../src/main/resources/log4j2.xml | 11 +-
.../common/common-core/pom.xml | 12 +-
.../core/advice/MyControllerAdvice.java | 2 +-
.../core/advice/MyExceptionHandler.java | 12 +-
.../core/annotation/DeptFilterColumn.java | 2 +-
.../core/annotation/DisableDataFilter.java | 2 +-
.../core/annotation/DisableTenantFilter.java | 2 +-
.../core/annotation/EnableDataPerm.java | 2 +-
.../core/annotation/JobUpdateTimeColumn.java | 4 +-
.../common/core/annotation/MyDataSource.java | 2 +-
.../core/annotation/MyDataSourceResolver.java | 4 +-
.../common/core/annotation/MyRequestBody.java | 2 +-
.../core/annotation/NoAuthInterface.java | 2 +-
.../core/annotation/RelationConstDict.java | 2 +-
.../common/core/annotation/RelationDict.java | 4 +-
.../core/annotation/RelationManyToMany.java | 2 +-
.../RelationManyToManyAggregation.java | 4 +-
.../core/annotation/RelationOneToMany.java | 4 +-
.../RelationOneToManyAggregation.java | 4 +-
.../core/annotation/RelationOneToOne.java | 4 +-
.../core/annotation/TenantFilterColumn.java | 2 +-
.../core/annotation/UploadFlagColumn.java | 4 +-
.../core/annotation/UserFilterColumn.java | 2 +-
.../common/core/aop/DataSourceAspect.java | 10 +-
.../core/aop/DataSourceResolveAspect.java | 14 +-
.../common/core/aop/DictCacheSyncAspect.java | 10 +-
.../common/core/base/dao/BaseDaoMapper.java | 2 +-
.../core/base/mapper/BaseModelMapper.java | 2 +-
.../core/base/mapper/DummyModelMapper.java | 2 +-
.../core/base/service/BaseDictService.java | 10 +-
.../common/core/base/service/BaseService.java | 212 ++++++++--
.../core/base/service/IBaseDictService.java | 2 +-
.../core/base/service/IBaseService.java | 79 +++-
.../common/core/cache/DictionaryCache.java | 2 +-
.../common/core/cache/MapDictionaryCache.java | 4 +-
.../core/cache/MapTreeDictionaryCache.java | 4 +-
.../core/config/CommonWebMvcConfig.java | 4 +-
.../core/config/DataSourceContextHolder.java | 2 +-
.../common/core/config/DynamicDataSource.java | 2 +-
.../common/core/config/EncryptConfig.java | 2 +-
.../core/config/RestTemplateConfig.java | 2 +-
.../common/core/config/TomcatConfig.java | 2 +-
.../common/core/constant/AggregationType.java | 2 +-
.../common/core/constant/AppDeviceType.java | 2 +-
.../core/constant/ApplicationConstant.java | 2 +-
.../common/core/constant/ErrorCodeEnum.java | 2 +-
.../core/constant/GlobalDeletedFlag.java | 2 +-
.../exception/DataValidationException.java | 2 +-
.../exception/InvalidClassFieldException.java | 2 +-
.../exception/InvalidDataFieldException.java | 2 +-
.../exception/InvalidDataModelException.java | 2 +-
.../exception/InvalidRedisModeException.java | 2 +-
.../exception/MapCacheAccessException.java | 2 +-
.../core/exception/MyRuntimeException.java | 2 +-
.../core/exception/NoDataAffectException.java | 2 +-
.../core/exception/NoDataPermException.java | 2 +-
.../exception/RedisCacheAccessException.java | 2 +-
.../MyRequestArgumentResolver.java | 4 +-
.../listener/LoadServiceRelationListener.java | 4 +-
.../common/core/object/CallResult.java | 2 +-
.../common/core/object/DummyClass.java | 2 +-
.../common/core/object/GlobalThreadLocal.java | 2 +-
.../common/core/object/LoginUserInfo.java | 2 +-
.../common/core/object/MyGroupCriteria.java | 2 +-
.../common/core/object/MyGroupParam.java | 12 +-
.../common/core/object/MyOrderParam.java | 12 +-
.../common/core/object/MyPageData.java | 2 +-
.../common/core/object/MyPageParam.java | 2 +-
.../common/core/object/MyRelationParam.java | 2 +-
.../common/core/object/MyWhereCriteria.java | 8 +-
.../common/core/object/ResponseResult.java | 20 +-
.../common/core/object/TableModelInfo.java | 33 ++
.../common/core/object/TokenData.java | 12 +-
.../common/core/object/Tuple2.java | 2 +-
.../common/core/upload/BaseUpDownloader.java | 8 +-
.../common/core/upload/LocalUpDownloader.java | 4 +-
.../core/upload/UpDownloaderFactory.java | 2 +-
.../core/upload/UploadResponseInfo.java | 2 +-
.../common/core/upload/UploadStoreInfo.java | 2 +-
.../core/upload/UploadStoreTypeEnum.java | 2 +-
.../common/core/util/AopTargetUtil.java | 2 +-
.../core/util/ApplicationContextHolder.java | 4 +-
.../common/core/util/ContextUtil.java | 2 +-
.../common/core/util/DataSourceResolver.java | 2 +-
.../common/core/util/ExportUtil.java | 6 +-
.../common/core/util/IpUtil.java | 5 +-
.../common/core/util/JwtUtil.java | 2 +-
.../common/core/util/LogMessageUtil.java | 2 +-
.../common/core/util/MyCommonUtil.java | 8 +-
.../common/core/util/MyDateUtil.java | 4 +-
.../common/core/util/MyModelUtil.java | 14 +-
.../common/core/util/MyPageUtil.java | 8 +-
.../common/core/util/RedisKeyUtil.java | 2 +-
.../common/core/util/RsaUtil.java | 2 +-
.../common/core/util/TreeNode.java | 2 +-
.../common/core/validator/AddGroup.java | 2 +-
.../common/core/validator/ConstDictRef.java | 2 +-
.../core/validator/ConstDictValidator.java | 2 +-
.../common/core/validator/TextLength.java | 2 +-
.../core/validator/TextLengthValidator.java | 2 +-
.../common/core/validator/UpdateGroup.java | 2 +-
.../common/common-datafilter/pom.xml | 6 +-
.../aop/DisableDataFilterAspect.java | 6 +-
.../config/DataFilterAutoConfig.java | 2 +-
.../config/DataFilterProperties.java | 2 +-
.../config/DataFilterWebMvcConfigurer.java | 4 +-
.../datafilter/constant/DataPermRuleType.java | 2 +-
.../interceptor/DataFilterInterceptor.java | 4 +-
.../MybatisDataFilterInterceptor.java | 27 +-
.../listener/LoadDataFilterInfoListener.java | 4 +-
.../main/resources/META-INF/spring.factories | 2 +-
.../common/common-log/pom.xml | 4 +-
.../common/log/annotation/OperationLog.java | 4 +-
.../common/log/aop/OperationLogAspect.java | 35 +-
.../log/config/CommonLogAutoConfig.java | 2 +-
.../log/config/OperationLogProperties.java | 2 +-
.../common/log/dao/SysOperationLogMapper.java | 6 +-
.../log/dao/mapper/SysOperationLogMapper.xml | 6 +-
.../common/log/model/SysOperationLog.java | 4 +-
.../model/constant/SysOperationLogType.java | 23 +-
.../log/service/SysOperationLogService.java | 6 +-
.../impl/SysOperationLogServiceImpl.java | 16 +-
.../main/resources/META-INF/spring.factories | 2 +-
.../common/common-redis/pom.xml | 4 +-
.../redis/cache/RedisDictionaryCache.java | 8 +-
.../redis/cache/RedisTreeDictionaryCache.java | 6 +-
.../redis/cache/RedissonCacheConfig.java | 2 +-
.../redis/cache/SessionCacheHelper.java | 4 +-
.../common/redis/config/RedissonConfig.java | 13 +-
.../main/resources/META-INF/spring.factories | 2 +-
.../common/common-sequence/pom.xml | 4 +-
.../config/IdGeneratorAutoConfig.java | 2 +-
.../config/IdGeneratorProperties.java | 2 +-
.../sequence/generator/BasicIdGenerator.java | 2 +-
.../sequence/generator/MyIdGenerator.java | 2 +-
.../sequence/wrapper/IdGeneratorWrapper.java | 8 +-
.../main/resources/META-INF/spring.factories | 2 +-
.../common/common-swagger/pom.xml | 39 ++
.../config/SwaggerAutoConfiguration.java | 56 +++
.../swagger/config/SwaggerProperties.java | 45 +++
.../common/swagger/plugin/ByteBuddyUtil.java | 85 ++++
.../plugin/DynamicBodyModelPlugin.java | 61 +++
.../plugin/DynamicBodyParameterBuilder.java | 64 +++
.../main/resources/META-INF/spring.factories | 2 +
.../orange-demo-single-service/common/pom.xml | 3 +-
.../framework/apidoc-tools/pom.xml | 4 +-
.../apidoc/tools/ExportApiApp.java | 8 +-
.../apidoc/tools/ExportDocApp.java | 8 +-
.../tools/codeparser/ApiCodeConfig.java | 2 +-
.../tools/codeparser/ApiCodeParser.java | 8 +-
.../ApiCodeConfigParseException.java | 2 +-
.../tools/exception/MapperParseException.java | 2 +-
.../apidoc/tools/export/ApiDocExporter.java | 6 +-
.../tools/export/ApiPostmanExporter.java | 6 +-
.../apidoc/tools/util/FreeMarkerUtils.java | 2 +-
.../src/main/resources/export-api-config.json | 6 +-
.../framework/pom.xml | 2 +-
.../orange-demo-single-service/pom.xml | 3 +-
.../zz-resource/db-scripts/zzdemo-single.sql | 380 ++++++++++--------
.../46296fa64fa94bc2a1dacde9bfd146cb.png | Bin 9808 -> 0 bytes
.../api/Controller/DictionaryController.js | 11 +
.../src/core/http/index.js | 34 +-
.../src/store/actions.js | 17 +-
.../src/store/getters.js | 3 +
.../src/store/mutations.js | 6 +
.../orange-demo-single-web/src/store/state.js | 5 +-
.../src/views/generated/formClass.vue | 26 +-
.../src/views/generated/formCourse.vue | 8 +-
.../src/views/generated/formCourseStats.vue | 4 +-
.../src/views/generated/formCreateClass.vue | 15 +-
.../src/views/generated/formCreateCourse.vue | 18 +-
.../src/views/generated/formCreateStudent.vue | 19 +-
.../src/views/generated/formEditClass.vue | 16 +-
.../generated/formEditClassCourseOrder.vue | 13 +-
.../src/views/generated/formEditCourse.vue | 19 +-
.../src/views/generated/formEditStudent.vue | 20 +-
.../views/generated/formSetClassCourse.vue | 8 +-
.../views/generated/formSetClassStudent.vue | 8 +-
.../src/views/generated/formStudent.vue | 8 +-
.../generated/formStudentActionDetail.vue | 2 +
.../generated/formStudentActionStats.vue | 2 +
.../src/views/layout/index.vue | 2 +-
.../src/views/upms/formSysDept/index.vue | 7 +
383 files changed, 3014 insertions(+), 1704 deletions(-)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/DeviceType.java (94%)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/ExpLevel.java (95%)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/Gender.java (94%)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/StudentActionType.java (97%)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/StudentStatus.java (95%)
rename orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/{orange/demo => orangeforms}/application/common/constant/Subject.java (94%)
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/WebAdminApplication.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/AreaCodeController.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/CourseController.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/CourseTransStatsController.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/GradeController.java (86%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/StudentActionStatsController.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/StudentActionTransController.java (84%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/StudentClassController.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/controller/StudentController.java (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/AreaCodeMapper.java (51%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/ClassCourseMapper.java (68%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/ClassStudentMapper.java (68%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/CourseMapper.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/CourseTransStatsMapper.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/GradeMapper.java (68%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/MaterialEditionMapper.java (69%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/StudentActionStatsMapper.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/StudentActionTransMapper.java (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/StudentClassMapper.java (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/StudentMapper.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/AreaCodeMapper.xml (79%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/ClassCourseMapper.xml (85%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/ClassStudentMapper.xml (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/CourseMapper.xml (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/CourseTransStatsMapper.xml (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/GradeMapper.xml (85%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/MaterialEditionMapper.xml (86%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/StudentActionStatsMapper.xml (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/StudentActionTransMapper.xml (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/StudentClassMapper.xml (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dao/mapper/StudentMapper.xml (96%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/ClassCourseDto.java (63%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/ClassStudentDto.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/CourseDto.java (56%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/CourseTransStatsDto.java (63%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/GradeDto.java (58%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/StudentActionStatsDto.java (69%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/StudentActionTransDto.java (61%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/StudentClassDto.java (54%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/dto/StudentDto.java (62%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/AreaCode.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/ClassCourse.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/ClassStudent.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/Course.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/CourseTransStats.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/Grade.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/MaterialEdition.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/Student.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/StudentActionStats.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/StudentActionTrans.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/StudentClass.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/constant/ClassLevel.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/constant/ClassStatus.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/model/constant/CourseDifficult.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/AreaCodeService.java (73%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/CourseService.java (82%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/CourseTransStatsService.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/GradeService.java (51%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/StudentActionStatsService.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/StudentActionTransService.java (77%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/StudentClassService.java (84%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/StudentService.java (82%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/AreaCodeServiceImpl.java (74%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/CourseServiceImpl.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/CourseTransStatsServiceImpl.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/GradeServiceImpl.java (71%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/StudentActionStatsServiceImpl.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/StudentActionTransServiceImpl.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/StudentClassServiceImpl.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/service/impl/StudentServiceImpl.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/AreaCodeVo.java (54%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/ClassCourseVo.java (52%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/ClassStudentVo.java (51%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/CourseTransStatsVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/CourseVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/GradeVo.java (51%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/StudentActionStatsVo.java (60%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/StudentActionTransVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/StudentClassVo.java (58%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/app/vo/StudentVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/config/ApplicationConfig.java (97%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/config/DataSourceConfig.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/config/FilterConfig.java (98%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/config/InterceptorConfig.java (84%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/interceptor/AuthenticationInterceptor.java (88%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/LoginController.java (80%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/LoginUserController.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysDataPermController.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysDeptController.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysMenuController.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysOperationLogController.java (77%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysPermCodeController.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysPermController.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysPermModuleController.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysRoleController.java (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/controller/SysUserController.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysDataPermDeptMapper.java (53%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysDataPermMapper.java (85%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysDataPermUserMapper.java (53%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysDeptMapper.java (82%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysDeptRelationMapper.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysMenuMapper.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysMenuPermCodeMapper.java (53%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysPermCodeMapper.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysPermCodePermMapper.java (54%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysPermMapper.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysPermModuleMapper.java (71%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysPermWhitelistMapper.java (53%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysRoleMapper.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysRoleMenuMapper.java (54%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysUserMapper.java (96%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/SysUserRoleMapper.java (53%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml (73%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysDataPermMapper.xml (83%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml (73%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysDeptMapper.xml (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysMenuMapper.xml (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml (73%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysPermCodeMapper.xml (96%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml (73%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysPermMapper.xml (97%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysPermModuleMapper.xml (80%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml (77%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysRoleMapper.xml (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml (72%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysUserMapper.xml (96%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dao/mapper/SysUserRoleMapper.xml (72%)
create mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysDataPermDto.java (60%)
create mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysMenuDto.java (62%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysOperationLogDto.java (61%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysPermCodeDto.java (62%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysPermDto.java (63%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysPermModuleDto.java (61%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysRoleDto.java (55%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/dto/SysUserDto.java (54%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysDataPerm.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysDataPermDept.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysDataPermUser.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysDept.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysDeptRelation.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysMenu.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysMenuPermCode.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysPerm.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysPermCode.java (91%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysPermCodePerm.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysPermModule.java (97%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysPermWhitelist.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysRole.java (88%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysRoleMenu.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysUser.java (87%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/SysUserRole.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysMenuType.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysOnlineMenuPermType.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysPermCodeType.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysPermModuleType.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysUserStatus.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/model/constant/SysUserType.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysDataPermService.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysDeptService.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysMenuService.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysPermCodeService.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysPermModuleService.java (90%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysPermService.java (86%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysPermWhitelistService.java (75%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysRoleService.java (85%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/SysUserService.java (96%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysDataPermServiceImpl.java (93%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysDeptServiceImpl.java (94%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysMenuServiceImpl.java (92%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysPermCodeServiceImpl.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysPermModuleServiceImpl.java (84%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysPermServiceImpl.java (89%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java (79%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysRoleServiceImpl.java (86%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/service/impl/SysUserServiceImpl.java (95%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysDataPermDeptVo.java (51%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysDataPermVo.java (61%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysDeptVo.java (57%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysMenuVo.java (62%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysOperationLogVo.java (65%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysPermCodeVo.java (60%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysPermModuleVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysPermVo.java (59%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysRoleVo.java (57%)
rename orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/{orange/demo => orangeforms}/webadmin/upms/vo/SysUserVo.java (59%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/advice/MyControllerAdvice.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/advice/MyExceptionHandler.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/DeptFilterColumn.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/DisableDataFilter.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/DisableTenantFilter.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/EnableDataPerm.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/JobUpdateTimeColumn.java (64%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/MyDataSource.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/MyDataSourceResolver.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/MyRequestBody.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/NoAuthInterface.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationConstDict.java (92%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationDict.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationManyToMany.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationManyToManyAggregation.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationOneToMany.java (92%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationOneToManyAggregation.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/RelationOneToOne.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/TenantFilterColumn.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/UploadFlagColumn.java (77%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/annotation/UserFilterColumn.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/aop/DataSourceAspect.java (81%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/aop/DataSourceResolveAspect.java (82%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/aop/DictCacheSyncAspect.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/dao/BaseDaoMapper.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/mapper/BaseModelMapper.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/mapper/DummyModelMapper.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/service/BaseDictService.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/service/BaseService.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/service/IBaseDictService.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/base/service/IBaseService.java (80%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/cache/DictionaryCache.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/cache/MapDictionaryCache.java (99%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/cache/MapTreeDictionaryCache.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/CommonWebMvcConfig.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/DataSourceContextHolder.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/DynamicDataSource.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/EncryptConfig.java (91%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/RestTemplateConfig.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/config/TomcatConfig.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/constant/AggregationType.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/constant/AppDeviceType.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/constant/ApplicationConstant.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/constant/ErrorCodeEnum.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/constant/GlobalDeletedFlag.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/DataValidationException.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/InvalidClassFieldException.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/InvalidDataFieldException.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/InvalidDataModelException.java (92%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/InvalidRedisModeException.java (92%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/MapCacheAccessException.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/MyRuntimeException.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/NoDataAffectException.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/NoDataPermException.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/exception/RedisCacheAccessException.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/interceptor/MyRequestArgumentResolver.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/listener/LoadServiceRelationListener.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/CallResult.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/DummyClass.java (92%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/GlobalThreadLocal.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/LoginUserInfo.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyGroupCriteria.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyGroupParam.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyOrderParam.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyPageData.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyPageParam.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyRelationParam.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/MyWhereCriteria.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/ResponseResult.java (87%)
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TableModelInfo.java
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/TokenData.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/object/Tuple2.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/BaseUpDownloader.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/LocalUpDownloader.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/UpDownloaderFactory.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/UploadResponseInfo.java (91%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/UploadStoreInfo.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/upload/UploadStoreTypeEnum.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/AopTargetUtil.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/ApplicationContextHolder.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/ContextUtil.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/DataSourceResolver.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/ExportUtil.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/IpUtil.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/JwtUtil.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/LogMessageUtil.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/MyCommonUtil.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/MyDateUtil.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/MyModelUtil.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/MyPageUtil.java (94%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/RedisKeyUtil.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/RsaUtil.java (99%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/util/TreeNode.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/AddGroup.java (75%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/ConstDictRef.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/ConstDictValidator.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/TextLength.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/TextLengthValidator.java (95%)
rename orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/{orange/demo => orangeforms}/common/core/validator/UpdateGroup.java (76%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/aop/DisableDataFilterAspect.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/config/DataFilterAutoConfig.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/config/DataFilterProperties.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/config/DataFilterWebMvcConfigurer.java (83%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/constant/DataPermRuleType.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/interceptor/DataFilterInterceptor.java (93%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/interceptor/MybatisDataFilterInterceptor.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/{orange/demo => orangeforms}/common/datafilter/listener/LoadDataFilterInfoListener.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/annotation/OperationLog.java (83%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/aop/OperationLogAspect.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/config/CommonLogAutoConfig.java (86%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/config/OperationLogProperties.java (89%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/dao/SysOperationLogMapper.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/dao/mapper/SysOperationLogMapper.xml (96%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/model/SysOperationLog.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/model/constant/SysOperationLogType.java (84%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/service/SysOperationLogService.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/{orange/demo => orangeforms}/common/log/service/impl/SysOperationLogServiceImpl.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/{orange/demo => orangeforms}/common/redis/cache/RedisDictionaryCache.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/{orange/demo => orangeforms}/common/redis/cache/RedisTreeDictionaryCache.java (98%)
rename orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/{orange/demo => orangeforms}/common/redis/cache/RedissonCacheConfig.java (97%)
rename orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/{orange/demo => orangeforms}/common/redis/cache/SessionCacheHelper.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/{orange/demo => orangeforms}/common/redis/config/RedissonConfig.java (88%)
rename orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/{orange/demo => orangeforms}/common/sequence/config/IdGeneratorAutoConfig.java (85%)
rename orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/{orange/demo => orangeforms}/common/sequence/config/IdGeneratorProperties.java (90%)
rename orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/{orange/demo => orangeforms}/common/sequence/generator/BasicIdGenerator.java (96%)
rename orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/{orange/demo => orangeforms}/common/sequence/generator/MyIdGenerator.java (87%)
rename orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/{orange/demo => orangeforms}/common/sequence/wrapper/IdGeneratorWrapper.java (83%)
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/pom.xml
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerAutoConfiguration.java
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerProperties.java
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/ByteBuddyUtil.java
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyModelPlugin.java
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyParameterBuilder.java
create mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/ExportApiApp.java (83%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/ExportDocApp.java (83%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/codeparser/ApiCodeConfig.java (97%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/codeparser/ApiCodeParser.java (99%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/exception/ApiCodeConfigParseException.java (89%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/exception/MapperParseException.java (89%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/export/ApiDocExporter.java (95%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/export/ApiPostmanExporter.java (92%)
rename orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/{orange/demo => orangeforms}/apidoc/tools/util/FreeMarkerUtils.java (92%)
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/46296fa64fa94bc2a1dacde9bfd146cb.png
diff --git a/orange-demo-single/orange-demo-single-service/README.md b/orange-demo-single/orange-demo-single-service/README.md
index 0939c817..20274fd0 100644
--- a/orange-demo-single/orange-demo-single-service/README.md
+++ b/orange-demo-single/orange-demo-single-service/README.md
@@ -1,5 +1,7 @@
### 服务接口文档
---
+- Knife4j
+ - 服务启动后，Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus)
- Postman
- 无需启动服务，即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下，找到ExportApiApp文件，并执行main函数。
diff --git a/orange-demo-single/orange-demo-single-service/application-common/pom.xml b/orange-demo-single/orange-demo-single-service/application-common/pom.xml
index a1eb142a..23cbd36e 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/pom.xml
+++ b/orange-demo-single/orange-demo-single-service/application-common/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- com.orange.demo
+ com.orangeforms
OrangeSingleDemo
1.0.0
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java
similarity index 94%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java
index 1dab32df..15b21b8b 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java
similarity index 95%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java
index acd2481f..1ab88021 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java
similarity index 94%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java
index fe098160..412e340b 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java
similarity index 97%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java
index e546ff4e..15163405 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java
similarity index 95%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java
index 9c39f2b1..fa087cc6 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java
similarity index 94%
rename from orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java
rename to orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java
index 9bf21fb4..00c859d4 100644
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java
+++ b/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java
@@ -1,4 +1,4 @@
-package com.orange.demo.application.common.constant;
+package com.orangeforms.application.common.constant;
import java.util.HashMap;
import java.util.Map;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml
index 139cd567..c5db6824 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml
@@ -2,7 +2,7 @@
- com.orange.demo
+ com.orangeforms
OrangeSingleDemo
1.0.0
@@ -16,30 +16,35 @@
- com.orange.demo
+ com.orangeforms
common-redis
1.0.0
- com.orange.demo
+ com.orangeforms
common-log
1.0.0
- com.orange.demo
+ com.orangeforms
common-sequence
1.0.0
- com.orange.demo
+ com.orangeforms
common-datafilter
1.0.0
- com.orange.demo
+ com.orangeforms
application-common
1.0.0
+
+ com.orangeforms
+ common-swagger
+ 1.0.0
+
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java
deleted file mode 100644
index 94e1de59..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDataPermDeptDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orange.demo.webadmin.upms.dto;
-
-import lombok.Data;
-
-/**
- * 数据权限与部门关联Dto。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-public class SysDataPermDeptDto {
-
- /**
- * 数据权限Id。
- */
- private Long dataPermId;
-
- /**
- * 关联部门Id。
- */
- private Long deptId;
-}
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java
deleted file mode 100644
index 511b265d..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/upms/dto/SysDeptDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.orange.demo.webadmin.upms.dto;
-
-import com.orange.demo.common.core.validator.UpdateGroup;
-
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-/**
- * SysDeptDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-public class SysDeptDto {
-
- /**
- * 部门Id。
- */
- @NotNull(message = "数据验证失败，部门Id不能为空！", groups = {UpdateGroup.class})
- private Long deptId;
-
- /**
- * 部门名称。
- */
- @NotBlank(message = "数据验证失败，部门名称不能为空！")
- private String deptName;
-
- /**
- * 显示顺序。
- */
- @NotNull(message = "数据验证失败，显示顺序不能为空！")
- private Integer showOrder;
-
- /**
- * 父部门Id。
- */
- private Long parentId;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
similarity index 87%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
index 243ab268..8e456cec 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/WebAdminApplication.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
@@ -1,4 +1,4 @@
-package com.orange.demo.webadmin;
+package com.orangeforms.webadmin;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
*/
@EnableAsync
@SpringBootApplication
-@ComponentScan("com.orange.demo")
+@ComponentScan("com.orangeforms")
public class WebAdminApplication {
public static void main(String[] args) {
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
similarity index 87%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
index 1d33bde5..ef96a4b1 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/AreaCodeController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
@@ -1,10 +1,11 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
+import io.swagger.annotations.Api;
import cn.jimmyshi.beanquery.BeanQuery;
-import com.orange.demo.webadmin.app.model.AreaCode;
-import com.orange.demo.webadmin.app.service.AreaCodeService;
-import com.orange.demo.common.core.object.ResponseResult;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.model.AreaCode;
+import com.orangeforms.webadmin.app.service.AreaCodeService;
+import com.orangeforms.common.core.object.ResponseResult;
+import com.orangeforms.common.core.annotation.MyRequestBody;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,6 +22,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "行政区划数据访问接口")
@RestController
@RequestMapping("/admin/app/areaCode")
public class AreaCodeController {
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java
similarity index 87%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java
index f0eed0ac..5284a34d 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java
@@ -1,24 +1,26 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import cn.hutool.core.util.ReflectUtil;
-import com.orange.demo.common.core.upload.BaseUpDownloader;
-import com.orange.demo.common.core.upload.UpDownloaderFactory;
-import com.orange.demo.common.core.upload.UploadResponseInfo;
-import com.orange.demo.common.core.upload.UploadStoreInfo;
-import com.orange.demo.common.log.annotation.OperationLog;
-import com.orange.demo.common.log.model.constant.SysOperationLogType;
+import com.orangeforms.common.core.upload.BaseUpDownloader;
+import com.orangeforms.common.core.upload.UpDownloaderFactory;
+import com.orangeforms.common.core.upload.UploadResponseInfo;
+import com.orangeforms.common.core.upload.UploadStoreInfo;
+import com.orangeforms.common.log.annotation.OperationLog;
+import com.orangeforms.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
-import com.orange.demo.common.redis.cache.SessionCacheHelper;
-import com.orange.demo.webadmin.config.ApplicationConfig;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.common.redis.cache.SessionCacheHelper;
+import com.orangeforms.webadmin.config.ApplicationConfig;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +35,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "课程数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/course")
@@ -53,6 +56,14 @@ public class CourseController {
* @param courseDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "courseDto.courseId",
+ "courseDto.priceStart",
+ "courseDto.priceEnd",
+ "courseDto.classHourStart",
+ "courseDto.classHourEnd",
+ "courseDto.createTimeStart",
+ "courseDto.createTimeEnd"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult add(@MyRequestBody CourseDto courseDto) {
@@ -64,8 +75,7 @@ public class CourseController {
// 验证关联Id的数据合法性
CallResult callResult = courseService.verifyRelatedData(course, null);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
course = courseService.saveNew(course);
return ResponseResult.success(course.getCourseId());
@@ -77,6 +87,13 @@ public class CourseController {
* @param courseDto 更新对象。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "courseDto.priceStart",
+ "courseDto.priceEnd",
+ "courseDto.classHourStart",
+ "courseDto.classHourEnd",
+ "courseDto.createTimeStart",
+ "courseDto.createTimeEnd"})
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult update(@MyRequestBody CourseDto courseDto) {
@@ -94,8 +111,7 @@ public class CourseController {
// 验证关联Id的数据合法性
CallResult callResult = courseService.verifyRelatedData(course, originalCourse);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
if (!courseService.update(course, originalCourse)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java
similarity index 89%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java
index 70400373..434a6fe4 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/CourseTransStatsController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java
@@ -1,14 +1,15 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "课程统计管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/courseTransStats")
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java
similarity index 86%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java
index b44fe17f..6d664385 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/GradeController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java
@@ -1,18 +1,20 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
import com.alibaba.fastjson.JSONObject;
import cn.jimmyshi.beanquery.BeanQuery;
-import com.orange.demo.webadmin.app.dto.GradeDto;
-import com.orange.demo.webadmin.app.model.Grade;
-import com.orange.demo.webadmin.app.service.GradeService;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
-import com.orange.demo.common.core.util.MyModelUtil;
-import com.orange.demo.common.core.util.MyCommonUtil;
-import com.orange.demo.common.core.object.ResponseResult;
-import com.orange.demo.common.core.annotation.MyRequestBody;
-import com.orange.demo.common.core.validator.UpdateGroup;
-import com.orange.demo.common.log.annotation.OperationLog;
-import com.orange.demo.common.log.model.constant.SysOperationLogType;
+import com.orangeforms.webadmin.app.dto.GradeDto;
+import com.orangeforms.webadmin.app.model.Grade;
+import com.orangeforms.webadmin.app.service.GradeService;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.util.MyModelUtil;
+import com.orangeforms.common.core.util.MyCommonUtil;
+import com.orangeforms.common.core.object.ResponseResult;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.log.annotation.OperationLog;
+import com.orangeforms.common.log.model.constant.SysOperationLogType;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "年级管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/grade")
@@ -41,6 +44,7 @@ public class GradeController {
* @param gradeDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"gradeDto.gradeId"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult add(@MyRequestBody GradeDto gradeDto) {
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java
similarity index 89%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java
index adbec277..ff41fb71 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionStatsController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java
@@ -1,14 +1,15 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "学生行为统计管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentActionStats")
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java
similarity index 84%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java
index 1530b765..de926864 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentActionTransController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java
@@ -1,16 +1,18 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
-import com.orange.demo.common.log.annotation.OperationLog;
-import com.orange.demo.common.log.model.constant.SysOperationLogType;
+import com.orangeforms.common.log.annotation.OperationLog;
+import com.orangeforms.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "学生行为流水管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentActionTrans")
@@ -37,6 +40,10 @@ public class StudentActionTransController {
* @param studentActionTransDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "studentActionTransDto.transId",
+ "studentActionTransDto.createTimeStart",
+ "studentActionTransDto.createTimeEnd"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult add(@MyRequestBody StudentActionTransDto studentActionTransDto) {
@@ -48,8 +55,7 @@ public class StudentActionTransController {
// 验证关联Id的数据合法性
CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, null);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
studentActionTrans = studentActionTransService.saveNew(studentActionTrans);
return ResponseResult.success(studentActionTrans.getTransId());
@@ -61,6 +67,9 @@ public class StudentActionTransController {
* @param studentActionTransDto 更新对象。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "studentActionTransDto.createTimeStart",
+ "studentActionTransDto.createTimeEnd"})
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult update(@MyRequestBody StudentActionTransDto studentActionTransDto) {
@@ -78,8 +87,7 @@ public class StudentActionTransController {
// 验证关联Id的数据合法性
CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, originalStudentActionTrans);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
if (!studentActionTransService.update(studentActionTrans, originalStudentActionTrans)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java
similarity index 91%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java
index 7cefa1b7..8ddf2a26 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentClassController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java
@@ -1,16 +1,18 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
-import com.orange.demo.common.log.annotation.OperationLog;
-import com.orange.demo.common.log.model.constant.SysOperationLogType;
+import com.orangeforms.common.log.annotation.OperationLog;
+import com.orangeforms.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,7 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "班级数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/studentClass")
@@ -42,6 +45,7 @@ public class StudentClassController {
* @param studentClassDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"studentClassDto.classId"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult add(@MyRequestBody StudentClassDto studentClassDto) {
@@ -53,8 +57,7 @@ public class StudentClassController {
// 验证关联Id的数据合法性
CallResult callResult = studentClassService.verifyRelatedData(studentClass, null);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
studentClass = studentClassService.saveNew(studentClass);
return ResponseResult.success(studentClass.getClassId());
@@ -83,8 +86,7 @@ public class StudentClassController {
// 验证关联Id的数据合法性
CallResult callResult = studentClassService.verifyRelatedData(studentClass, originalStudentClass);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
if (!studentClassService.update(studentClass, originalStudentClass)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -189,6 +191,7 @@ public class StudentClassController {
courseList = courseService.getNotInCourseListByClassId(classId, filter, orderBy);
} else {
courseList = courseService.getCourseList(filter, orderBy);
+ courseService.buildRelationForDataList(courseList, MyRelationParam.dictOnly());
}
return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE));
}
@@ -342,6 +345,7 @@ public class StudentClassController {
studentList = studentService.getNotInStudentListByClassId(classId, filter, orderBy);
} else {
studentList = studentService.getStudentList(filter, orderBy);
+ studentService.buildRelationForDataList(studentList, MyRelationParam.dictOnly());
}
return ResponseResult.success(MyPageUtil.makeResponseData(studentList, Student.INSTANCE));
}
@@ -424,24 +428,4 @@ public class StudentClassController {
}
return ResponseResult.success();
}
-
- private String doBusinessDataVerify(
- StudentClassDto studentClassDto,
- boolean forUpdate,
- List classCourseDtoList,
- List classStudentDtoList) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto, forUpdate);
- if (errorMessage != null) {
- return errorMessage;
- }
- errorMessage = MyCommonUtil.getModelValidationError(classCourseDtoList);
- if (errorMessage != null) {
- return "参数 [classCourseDtoList] 数据验证失败" + errorMessage;
- }
- errorMessage = MyCommonUtil.getModelValidationError(classStudentDtoList);
- if (errorMessage != null) {
- return "参数 [classStudentDtoList] 数据验证失败" + errorMessage;
- }
- return null;
- }
}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java
similarity index 83%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java
index 0ea4430e..950a62e7 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/controller/StudentController.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java
@@ -1,17 +1,19 @@
-package com.orange.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
import cn.jimmyshi.beanquery.BeanQuery;
-import com.orange.demo.common.log.annotation.OperationLog;
-import com.orange.demo.common.log.model.constant.SysOperationLogType;
+import com.orangeforms.common.log.annotation.OperationLog;
+import com.orangeforms.common.log.model.constant.SysOperationLogType;
import com.github.pagehelper.page.PageMethod;
-import com.orange.demo.webadmin.app.vo.*;
-import com.orange.demo.webadmin.app.dto.*;
-import com.orange.demo.webadmin.app.model.*;
-import com.orange.demo.webadmin.app.service.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.*;
-import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.vo.*;
+import com.orangeforms.webadmin.app.dto.*;
+import com.orangeforms.webadmin.app.model.*;
+import com.orangeforms.webadmin.app.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,7 @@ import java.util.*;
* @author Jerry
* @date 2020-09-24
*/
+@Api(tags = "学生数据管理接口")
@Slf4j
@RestController
@RequestMapping("/admin/app/student")
@@ -38,6 +41,13 @@ public class StudentController {
* @param studentDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "studentDto.studentId",
+ "studentDto.searchString",
+ "studentDto.birthdayStart",
+ "studentDto.birthdayEnd",
+ "studentDto.registerTimeStart",
+ "studentDto.registerTimeEnd"})
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
public ResponseResult add(@MyRequestBody StudentDto studentDto) {
@@ -49,8 +59,7 @@ public class StudentController {
// 验证关联Id的数据合法性
CallResult callResult = studentService.verifyRelatedData(student, null);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
student = studentService.saveNew(student);
return ResponseResult.success(student.getStudentId());
@@ -62,6 +71,12 @@ public class StudentController {
* @param studentDto 更新对象。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "studentDto.searchString",
+ "studentDto.birthdayStart",
+ "studentDto.birthdayEnd",
+ "studentDto.registerTimeStart",
+ "studentDto.registerTimeEnd"})
@OperationLog(type = SysOperationLogType.UPDATE)
@PostMapping("/update")
public ResponseResult update(@MyRequestBody StudentDto studentDto) {
@@ -79,8 +94,7 @@ public class StudentController {
// 验证关联Id的数据合法性
CallResult callResult = studentService.verifyRelatedData(student, originalStudent);
if (!callResult.isSuccess()) {
- errorMessage = callResult.getErrorMessage();
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
+ return ResponseResult.errorFrom(callResult);
}
if (!studentService.update(student, originalStudent)) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
similarity index 51%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
index cf6f342a..fbf9293f 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/AreaCodeMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.AreaCode;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.AreaCode;
/**
* 行政区划数据操作访问接口。
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java
similarity index 68%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java
index 3f0b9948..69ebef35 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassCourseMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.ClassCourse;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.ClassCourse;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java
similarity index 68%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java
index cac49c21..169b64b2 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/ClassStudentMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.ClassStudent;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.ClassStudent;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java
similarity index 91%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java
index d563f740..824702e8 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.Course;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.Course;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java
similarity index 90%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java
index 820b67ac..6a61252f 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/CourseTransStatsMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.CourseTransStats;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.CourseTransStats;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java
similarity index 68%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java
index 766d3092..b296b969 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/GradeMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.Grade;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.Grade;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java
similarity index 69%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java
index e4ef51fc..24f4e1f3 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/MaterialEditionMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.MaterialEdition;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.MaterialEdition;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java
similarity index 90%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java
index fac57279..e284204c 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionStatsMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.StudentActionStats;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.StudentActionStats;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java
similarity index 83%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java
index 6f4fe06b..b556fc41 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentActionTransMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.StudentActionTrans;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.StudentActionTrans;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java
similarity index 83%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java
index 6a2f5bcd..2bdb53b5 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentClassMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.StudentClass;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.StudentClass;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java
similarity index 91%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java
index 30284477..22fd6c53 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/StudentMapper.java
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java
@@ -1,7 +1,7 @@
-package com.orange.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.webadmin.app.model.Student;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.Student;
import org.apache.ibatis.annotations.Param;
import java.util.*;
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
similarity index 79%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
index aa7cdb10..09e629fa 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/AreaCodeMapper.xml
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml
similarity index 85%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml
index 7bc14dac..d4f87e62 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassCourseMapper.xml
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml
similarity index 83%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml
index a7588f1c..d854784e 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/ClassStudentMapper.xml
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml
similarity index 93%
rename from orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml
rename to orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml
index e285da41..60c3a7ba 100644
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orange/demo/webadmin/app/dao/mapper/CourseMapper.xml
+++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml
@@ -1,7 +1,7 @@
-
-
+
+
@@ -16,9 +16,9 @@
-
+
+ notNullColumn="course_id" resultMap="com.orangeforms.webadmin.app.dao.ClassCourseMapper.BaseResultMap" />
@@ -55,7 +55,7 @@
-
+
@@ -95,7 +95,7 @@
-