From 73edb28fae31e59484750bad238c87d15cd88efe Mon Sep 17 00:00:00 2001
From: orange-form <3510245832@qq.com>
Date: Fri, 5 Jul 2024 14:31:57 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20orange-d?=
=?UTF-8?q?emo-single?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../orange-demo-single-service/.gitignore | 26 -
.../orange-demo-single-service/README.md | 17 -
.../application-common/pom.xml | 16 -
.../common/constant/DeviceType.java | 49 -
.../application/common/constant/ExpLevel.java | 49 -
.../application/common/constant/Gender.java | 44 -
.../common/constant/StudentActionType.java | 89 -
.../common/constant/StudentStatus.java | 49 -
.../application/common/constant/Subject.java | 49 -
.../application-webadmin/pom.xml | 98 -
.../webadmin/WebAdminApplication.java | 22 -
.../app/controller/AreaCodeController.java | 74 -
.../app/controller/CourseController.java | 317 -
.../CourseTransStatsController.java | 107 -
.../app/controller/GradeController.java | 160 -
.../StudentActionStatsController.java | 107 -
.../StudentActionTransController.java | 171 -
.../controller/StudentClassController.java | 426 -
.../app/controller/StudentController.java | 205 -
.../webadmin/app/dao/AreaCodeMapper.java | 13 -
.../webadmin/app/dao/ClassCourseMapper.java | 22 -
.../webadmin/app/dao/ClassStudentMapper.java | 22 -
.../webadmin/app/dao/CourseMapper.java | 59 -
.../app/dao/CourseTransStatsMapper.java | 48 -
.../webadmin/app/dao/GradeMapper.java | 22 -
.../app/dao/MaterialEditionMapper.java | 22 -
.../app/dao/StudentActionStatsMapper.java | 48 -
.../app/dao/StudentActionTransMapper.java | 33 -
.../webadmin/app/dao/StudentClassMapper.java | 33 -
.../webadmin/app/dao/StudentMapper.java | 59 -
.../app/dao/mapper/AreaCodeMapper.xml | 10 -
.../app/dao/mapper/ClassCourseMapper.xml | 22 -
.../app/dao/mapper/ClassStudentMapper.xml | 19 -
.../webadmin/app/dao/mapper/CourseMapper.xml | 139 -
.../app/dao/mapper/CourseTransStatsMapper.xml | 94 -
.../webadmin/app/dao/mapper/GradeMapper.xml | 22 -
.../app/dao/mapper/MaterialEditionMapper.xml | 22 -
.../dao/mapper/StudentActionStatsMapper.xml | 142 -
.../dao/mapper/StudentActionTransMapper.xml | 101 -
.../app/dao/mapper/StudentClassMapper.xml | 72 -
.../webadmin/app/dao/mapper/StudentMapper.xml | 145 -
.../webadmin/app/dto/ClassCourseDto.java | 41 -
.../webadmin/app/dto/ClassStudentDto.java | 34 -
.../webadmin/app/dto/CourseDto.java | 144 -
.../webadmin/app/dto/CourseTransStatsDto.java | 105 -
.../webadmin/app/dto/GradeDto.java | 34 -
.../app/dto/StudentActionStatsDto.java | 180 -
.../app/dto/StudentActionTransDto.java | 136 -
.../webadmin/app/dto/StudentClassDto.java | 79 -
.../webadmin/app/dto/StudentDto.java | 162 -
.../webadmin/app/model/AreaCode.java | 39 -
.../webadmin/app/model/ClassCourse.java | 33 -
.../webadmin/app/model/ClassStudent.java | 27 -
.../webadmin/app/model/Course.java | 183 -
.../webadmin/app/model/CourseTransStats.java | 132 -
.../orangeforms/webadmin/app/model/Grade.java | 33 -
.../webadmin/app/model/MaterialEdition.java | 32 -
.../webadmin/app/model/Student.java | 233 -
.../app/model/StudentActionStats.java | 209 -
.../app/model/StudentActionTrans.java | 179 -
.../webadmin/app/model/StudentClass.java | 124 -
.../app/model/constant/ClassLevel.java | 49 -
.../app/model/constant/ClassStatus.java | 44 -
.../app/model/constant/CourseDifficult.java | 49 -
.../webadmin/app/service/AreaCodeService.java | 23 -
.../webadmin/app/service/CourseService.java | 88 -
.../app/service/CourseTransStatsService.java | 48 -
.../webadmin/app/service/GradeService.java | 13 -
.../service/StudentActionStatsService.java | 48 -
.../service/StudentActionTransService.java | 68 -
.../app/service/StudentClassService.java | 119 -
.../webadmin/app/service/StudentService.java | 88 -
.../app/service/impl/AreaCodeServiceImpl.java | 52 -
.../app/service/impl/CourseServiceImpl.java | 211 -
.../impl/CourseTransStatsServiceImpl.java | 95 -
.../app/service/impl/GradeServiceImpl.java | 49 -
.../impl/StudentActionStatsServiceImpl.java | 97 -
.../impl/StudentActionTransServiceImpl.java | 164 -
.../service/impl/StudentClassServiceImpl.java | 285 -
.../app/service/impl/StudentServiceImpl.java | 234 -
.../util/CaptchaCacheServiceRedisImpl.java | 52 -
.../webadmin/app/vo/AreaCodeVo.java | 40 -
.../webadmin/app/vo/ClassCourseVo.java | 34 -
.../webadmin/app/vo/ClassStudentVo.java | 28 -
.../webadmin/app/vo/CourseTransStatsVo.java | 91 -
.../orangeforms/webadmin/app/vo/CourseVo.java | 116 -
.../orangeforms/webadmin/app/vo/GradeVo.java | 28 -
.../webadmin/app/vo/StudentActionStatsVo.java | 163 -
.../webadmin/app/vo/StudentActionTransVo.java | 133 -
.../webadmin/app/vo/StudentClassVo.java | 85 -
.../webadmin/app/vo/StudentVo.java | 157 -
.../webadmin/config/ApplicationConfig.java | 51 -
.../webadmin/config/DataSourceConfig.java | 30 -
.../webadmin/config/FilterConfig.java | 61 -
.../webadmin/config/InterceptorConfig.java | 21 -
.../AuthenticationInterceptor.java | 143 -
.../upms/controller/LoginController.java | 344 -
.../upms/controller/LoginUserController.java | 83 -
.../controller/SysDataPermController.java | 300 -
.../upms/controller/SysDeptController.java | 226 -
.../upms/controller/SysMenuController.java | 224 -
.../controller/SysOperationLogController.java | 61 -
.../controller/SysPermCodeController.java | 195 -
.../upms/controller/SysPermController.java | 196 -
.../controller/SysPermModuleController.java | 168 -
.../upms/controller/SysRoleController.java | 358 -
.../upms/controller/SysUserController.java | 359 -
.../upms/dao/SysDataPermDeptMapper.java | 13 -
.../webadmin/upms/dao/SysDataPermMapper.java | 35 -
.../upms/dao/SysDataPermUserMapper.java | 13 -
.../webadmin/upms/dao/SysDeptMapper.java | 33 -
.../upms/dao/SysDeptRelationMapper.java | 42 -
.../webadmin/upms/dao/SysMenuMapper.java | 54 -
.../upms/dao/SysMenuPermCodeMapper.java | 13 -
.../webadmin/upms/dao/SysPermCodeMapper.java | 45 -
.../upms/dao/SysPermCodePermMapper.java | 13 -
.../webadmin/upms/dao/SysPermMapper.java | 54 -
.../upms/dao/SysPermModuleMapper.java | 22 -
.../upms/dao/SysPermWhitelistMapper.java | 13 -
.../webadmin/upms/dao/SysRoleMapper.java | 45 -
.../webadmin/upms/dao/SysRoleMenuMapper.java | 13 -
.../webadmin/upms/dao/SysUserMapper.java | 115 -
.../webadmin/upms/dao/SysUserRoleMapper.java | 13 -
.../upms/dao/mapper/SysDataPermDeptMapper.xml | 8 -
.../upms/dao/mapper/SysDataPermMapper.xml | 60 -
.../upms/dao/mapper/SysDataPermUserMapper.xml | 8 -
.../upms/dao/mapper/SysDeptMapper.xml | 70 -
.../upms/dao/mapper/SysDeptRelationMapper.xml | 29 -
.../upms/dao/mapper/SysMenuMapper.xml | 107 -
.../upms/dao/mapper/SysMenuPermCodeMapper.xml | 8 -
.../upms/dao/mapper/SysPermCodeMapper.xml | 90 -
.../upms/dao/mapper/SysPermCodePermMapper.xml | 8 -
.../upms/dao/mapper/SysPermMapper.xml | 131 -
.../upms/dao/mapper/SysPermModuleMapper.xml | 40 -
.../dao/mapper/SysPermWhitelistMapper.xml | 9 -
.../upms/dao/mapper/SysRoleMapper.xml | 89 -
.../upms/dao/mapper/SysRoleMenuMapper.xml | 8 -
.../upms/dao/mapper/SysUserMapper.xml | 246 -
.../upms/dao/mapper/SysUserRoleMapper.xml | 8 -
.../webadmin/upms/dto/SysDataPermDeptDto.java | 28 -
.../webadmin/upms/dto/SysDataPermDto.java | 56 -
.../webadmin/upms/dto/SysDeptDto.java | 73 -
.../webadmin/upms/dto/SysMenuDto.java | 75 -
.../webadmin/upms/dto/SysOperationLogDto.java | 78 -
.../webadmin/upms/dto/SysPermCodeDto.java | 64 -
.../webadmin/upms/dto/SysPermDto.java | 61 -
.../webadmin/upms/dto/SysPermModuleDto.java | 57 -
.../webadmin/upms/dto/SysRoleDto.java | 33 -
.../webadmin/upms/dto/SysUserDto.java | 119 -
.../webadmin/upms/model/SysDataPerm.java | 106 -
.../webadmin/upms/model/SysDataPermDept.java | 29 -
.../webadmin/upms/model/SysDataPermUser.java | 27 -
.../webadmin/upms/model/SysDept.java | 81 -
.../webadmin/upms/model/SysDeptRelation.java | 31 -
.../webadmin/upms/model/SysMenu.java | 130 -
.../webadmin/upms/model/SysMenuPermCode.java | 27 -
.../webadmin/upms/model/SysPerm.java | 80 -
.../webadmin/upms/model/SysPermCode.java | 113 -
.../webadmin/upms/model/SysPermCodePerm.java | 27 -
.../webadmin/upms/model/SysPermModule.java | 74 -
.../webadmin/upms/model/SysPermWhitelist.java | 33 -
.../webadmin/upms/model/SysRole.java | 89 -
.../webadmin/upms/model/SysRoleMenu.java | 27 -
.../webadmin/upms/model/SysUser.java | 184 -
.../webadmin/upms/model/SysUserRole.java | 27 -
.../upms/model/constant/SysMenuType.java | 54 -
.../model/constant/SysOnlineMenuPermType.java | 44 -
.../upms/model/constant/SysPermCodeType.java | 49 -
.../model/constant/SysPermModuleType.java | 44 -
.../upms/model/constant/SysUserStatus.java | 44 -
.../upms/model/constant/SysUserType.java | 49 -
.../upms/service/SysDataPermService.java | 104 -
.../webadmin/upms/service/SysDeptService.java | 78 -
.../webadmin/upms/service/SysMenuService.java | 111 -
.../upms/service/SysPermCodeService.java | 94 -
.../upms/service/SysPermModuleService.java | 63 -
.../webadmin/upms/service/SysPermService.java | 107 -
.../upms/service/SysPermWhitelistService.java | 23 -
.../webadmin/upms/service/SysRoleService.java | 105 -
.../webadmin/upms/service/SysUserService.java | 170 -
.../service/impl/SysDataPermServiceImpl.java | 334 -
.../upms/service/impl/SysDeptServiceImpl.java | 237 -
.../upms/service/impl/SysMenuServiceImpl.java | 331 -
.../service/impl/SysPermCodeServiceImpl.java | 224 -
.../impl/SysPermModuleServiceImpl.java | 122 -
.../upms/service/impl/SysPermServiceImpl.java | 241 -
.../impl/SysPermWhitelistServiceImpl.java | 52 -
.../upms/service/impl/SysRoleServiceImpl.java | 226 -
.../upms/service/impl/SysUserServiceImpl.java | 364 -
.../webadmin/upms/vo/SysDataPermDeptVo.java | 28 -
.../webadmin/upms/vo/SysDataPermVo.java | 72 -
.../webadmin/upms/vo/SysDeptVo.java | 66 -
.../webadmin/upms/vo/SysMenuVo.java | 102 -
.../webadmin/upms/vo/SysOperationLogVo.java | 145 -
.../webadmin/upms/vo/SysPermCodeVo.java | 84 -
.../webadmin/upms/vo/SysPermModuleVo.java | 78 -
.../webadmin/upms/vo/SysPermVo.java | 84 -
.../webadmin/upms/vo/SysRoleVo.java | 60 -
.../webadmin/upms/vo/SysUserVo.java | 116 -
...m.anji.captcha.service.CaptchaCacheService | 1 -
.../src/main/resources/application-dev.yml | 96 -
.../src/main/resources/application.yml | 144 -
.../resources/images/jigsaw/original/bg1.png | Bin 105636 -> 0 bytes
.../resources/images/jigsaw/original/bg10.png | Bin 87531 -> 0 bytes
.../resources/images/jigsaw/original/bg11.png | Bin 83599 -> 0 bytes
.../resources/images/jigsaw/original/bg12.png | Bin 78934 -> 0 bytes
.../resources/images/jigsaw/original/bg13.png | Bin 81552 -> 0 bytes
.../resources/images/jigsaw/original/bg14.png | Bin 59228 -> 0 bytes
.../resources/images/jigsaw/original/bg15.png | Bin 85655 -> 0 bytes
.../resources/images/jigsaw/original/bg16.png | Bin 73738 -> 0 bytes
.../resources/images/jigsaw/original/bg17.png | Bin 76842 -> 0 bytes
.../resources/images/jigsaw/original/bg18.png | Bin 73061 -> 0 bytes
.../resources/images/jigsaw/original/bg19.png | Bin 85663 -> 0 bytes
.../resources/images/jigsaw/original/bg2.png | Bin 82613 -> 0 bytes
.../resources/images/jigsaw/original/bg20.png | Bin 77849 -> 0 bytes
.../resources/images/jigsaw/original/bg3.png | Bin 96776 -> 0 bytes
.../resources/images/jigsaw/original/bg4.png | Bin 90015 -> 0 bytes
.../resources/images/jigsaw/original/bg5.png | Bin 70640 -> 0 bytes
.../resources/images/jigsaw/original/bg6.png | Bin 84881 -> 0 bytes
.../resources/images/jigsaw/original/bg7.png | Bin 66861 -> 0 bytes
.../resources/images/jigsaw/original/bg8.png | Bin 65868 -> 0 bytes
.../resources/images/jigsaw/original/bg9.png | Bin 83763 -> 0 bytes
.../images/jigsaw/slidingBlock/1.png | Bin 22049 -> 0 bytes
.../images/jigsaw/slidingBlock/10.png | Bin 6662 -> 0 bytes
.../images/jigsaw/slidingBlock/11.png | Bin 6663 -> 0 bytes
.../images/jigsaw/slidingBlock/2.png | Bin 21367 -> 0 bytes
.../images/jigsaw/slidingBlock/3.png | Bin 21660 -> 0 bytes
.../images/jigsaw/slidingBlock/4.png | Bin 21923 -> 0 bytes
.../images/jigsaw/slidingBlock/5.png | Bin 7853 -> 0 bytes
.../images/jigsaw/slidingBlock/6.png | Bin 7970 -> 0 bytes
.../images/jigsaw/slidingBlock/7.png | Bin 7749 -> 0 bytes
.../images/jigsaw/slidingBlock/8.png | Bin 6660 -> 0 bytes
.../images/jigsaw/slidingBlock/9.png | Bin 6659 -> 0 bytes
.../main/resources/images/pic-click/bg1.png | Bin 36206 -> 0 bytes
.../main/resources/images/pic-click/bg2.png | Bin 43926 -> 0 bytes
.../main/resources/images/pic-click/bg3.png | Bin 41195 -> 0 bytes
.../main/resources/images/pic-click/bg4.png | Bin 52213 -> 0 bytes
.../main/resources/images/pic-click/bg5.png | Bin 27608 -> 0 bytes
.../main/resources/images/pic-click/bg6.png | Bin 30151 -> 0 bytes
.../main/resources/images/pic-click/bg7.png | Bin 59340 -> 0 bytes
.../main/resources/images/pic-click/bg8.png | Bin 37701 -> 0 bytes
.../main/resources/images/pic-click/bg9.png | Bin 40371 -> 0 bytes
.../src/main/resources/logback-spring.xml | 91 -
.../common/common-core/pom.xml | 114 -
.../core/advice/MyControllerAdvice.java | 31 -
.../core/advice/MyExceptionHandler.java | 141 -
.../core/annotation/DeptFilterColumn.java | 16 -
.../core/annotation/DisableDataFilter.java | 17 -
.../core/annotation/DisableTenantFilter.java | 28 -
.../core/annotation/EnableDataPerm.java | 35 -
.../core/annotation/JobUpdateTimeColumn.java | 16 -
.../common/core/annotation/MyDataSource.java | 21 -
.../core/annotation/MyDataSourceResolver.java | 29 -
.../common/core/annotation/MyRequestBody.java | 31 -
.../core/annotation/NoAuthInterface.java | 15 -
.../core/annotation/RelationConstDict.java | 29 -
.../common/core/annotation/RelationDict.java | 70 -
.../core/annotation/RelationManyToMany.java | 38 -
.../RelationManyToManyAggregation.java | 95 -
.../core/annotation/RelationOneToMany.java | 53 -
.../RelationOneToManyAggregation.java | 67 -
.../core/annotation/RelationOneToOne.java | 60 -
.../core/annotation/TenantFilterColumn.java | 16 -
.../core/annotation/UploadFlagColumn.java | 24 -
.../core/annotation/UserFilterColumn.java | 16 -
.../common/core/aop/DataSourceAspect.java | 48 -
.../core/aop/DataSourceResolveAspect.java | 62 -
.../common/core/aop/DictCacheSyncAspect.java | 64 -
.../common/core/base/dao/BaseDaoMapper.java | 87 -
.../core/base/mapper/BaseModelMapper.java | 124 -
.../core/base/mapper/DummyModelMapper.java | 58 -
.../core/base/service/BaseDictService.java | 266 -
.../common/core/base/service/BaseService.java | 2008 -
.../core/base/service/IBaseDictService.java | 82 -
.../core/base/service/IBaseService.java | 439 -
.../common/core/cache/DictionaryCache.java | 88 -
.../common/core/cache/MapDictionaryCache.java | 358 -
.../core/cache/MapTreeDictionaryCache.java | 292 -
.../core/config/CommonWebMvcConfig.java | 68 -
.../common/core/config/CoreProperties.java | 43 -
.../core/config/DataSourceContextHolder.java | 52 -
.../common/core/config/DynamicDataSource.java | 17 -
.../common/core/config/EncryptConfig.java | 20 -
.../core/config/RestTemplateConfig.java | 64 -
.../common/core/config/TomcatConfig.java | 39 -
.../common/core/constant/AggregationType.java | 81 -
.../common/core/constant/AppDeviceType.java | 59 -
.../core/constant/ApplicationConstant.java | 85 -
.../common/core/constant/ErrorCodeEnum.java | 84 -
.../core/constant/GlobalDeletedFlag.java | 25 -
.../exception/DataValidationException.java | 26 -
.../exception/InvalidClassFieldException.java | 30 -
.../exception/InvalidDataFieldException.java | 30 -
.../exception/InvalidDataModelException.java | 27 -
.../exception/InvalidRedisModeException.java | 27 -
.../exception/MapCacheAccessException.java | 20 -
.../core/exception/MyRuntimeException.java | 36 -
.../core/exception/NoDataAffectException.java | 26 -
.../core/exception/NoDataPermException.java | 26 -
.../exception/RedisCacheAccessException.java | 20 -
.../MyRequestArgumentResolver.java | 234 -
.../listener/LoadServiceRelationListener.java | 28 -
.../common/core/object/CallResult.java | 104 -
.../common/core/object/DummyClass.java | 27 -
.../common/core/object/GlobalThreadLocal.java | 52 -
.../common/core/object/LoginUserInfo.java | 62 -
.../common/core/object/MyGroupCriteria.java | 24 -
.../common/core/object/MyGroupParam.java | 194 -
.../common/core/object/MyOrderParam.java | 265 -
.../common/core/object/MyPageData.java | 36 -
.../common/core/object/MyPageParam.java | 58 -
.../common/core/object/MyRelationParam.java | 91 -
.../common/core/object/MyWhereCriteria.java | 361 -
.../common/core/object/ResponseResult.java | 235 -
.../common/core/object/TableModelInfo.java | 33 -
.../common/core/object/TokenData.java | 111 -
.../common/core/object/Tuple2.java | 50 -
.../common/core/upload/BaseUpDownloader.java | 137 -
.../common/core/upload/LocalUpDownloader.java | 149 -
.../core/upload/UpDownloaderFactory.java | 49 -
.../core/upload/UploadResponseInfo.java | 29 -
.../common/core/upload/UploadStoreInfo.java | 22 -
.../core/upload/UploadStoreTypeEnum.java | 19 -
.../common/core/util/AopTargetUtil.java | 64 -
.../core/util/ApplicationContextHolder.java | 90 -
.../common/core/util/ContextUtil.java | 49 -
.../common/core/util/DataSourceResolver.java | 19 -
.../common/core/util/ExportUtil.java | 95 -
.../common/core/util/ImportUtil.java | 252 -
.../orangeforms/common/core/util/IpUtil.java | 104 -
.../orangeforms/common/core/util/JwtUtil.java | 110 -
.../common/core/util/LogMessageUtil.java | 33 -
.../common/core/util/MyCommonUtil.java | 262 -
.../common/core/util/MyDateUtil.java | 201 -
.../common/core/util/MyModelUtil.java | 772 -
.../common/core/util/MyPageUtil.java | 108 -
.../common/core/util/RedisKeyUtil.java | 86 -
.../orangeforms/common/core/util/RsaUtil.java | 115 -
.../common/core/util/TreeNode.java | 93 -
.../common/core/validator/AddGroup.java | 10 -
.../common/core/validator/ConstDictRef.java | 48 -
.../core/validator/ConstDictValidator.java | 33 -
.../common/core/validator/TextLength.java | 55 -
.../core/validator/TextLengthValidator.java | 39 -
.../common/core/validator/UpdateGroup.java | 11 -
.../common/common-datafilter/pom.xml | 29 -
.../aop/DisableDataFilterAspect.java | 41 -
.../config/DataFilterAutoConfig.java | 13 -
.../config/DataFilterProperties.java | 44 -
.../config/DataFilterWebMvcConfigurer.java | 21 -
.../datafilter/constant/DataPermRuleType.java | 69 -
.../interceptor/DataFilterInterceptor.java | 42 -
.../MybatisDataFilterInterceptor.java | 479 -
.../listener/LoadDataFilterInfoListener.java | 25 -
.../main/resources/META-INF/spring.factories | 2 -
.../common/common-log/pom.xml | 43 -
.../common/log/annotation/OperationLog.java | 33 -
.../common/log/aop/OperationLogAspect.java | 260 -
.../log/config/CommonLogAutoConfig.java | 13 -
.../log/config/OperationLogProperties.java | 24 -
.../common/log/dao/SysOperationLogMapper.java | 34 -
.../log/dao/mapper/SysOperationLogMapper.xml | 99 -
.../common/log/model/SysOperationLog.java | 170 -
.../model/constant/SysOperationLogType.java | 166 -
.../log/service/SysOperationLogService.java | 45 -
.../impl/SysOperationLogServiceImpl.java | 84 -
.../main/resources/META-INF/spring.factories | 2 -
.../common/common-redis/pom.xml | 29 -
.../redis/cache/RedisDictionaryCache.java | 417 -
.../redis/cache/RedisTreeDictionaryCache.java | 354 -
.../redis/cache/RedissonCacheConfig.java | 67 -
.../redis/cache/SessionCacheHelper.java | 97 -
.../common/redis/config/RedissonConfig.java | 105 -
.../main/resources/META-INF/spring.factories | 2 -
.../common/common-sequence/pom.xml | 24 -
.../config/IdGeneratorAutoConfig.java | 14 -
.../config/IdGeneratorProperties.java | 20 -
.../sequence/generator/BasicIdGenerator.java | 48 -
.../sequence/generator/MyIdGenerator.java | 24 -
.../sequence/wrapper/IdGeneratorWrapper.java | 52 -
.../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 | 22 -
.../framework/apidoc-tools/pom.xml | 29 -
.../apidoc/tools/ExportApiApp.java | 28 -
.../apidoc/tools/ExportDocApp.java | 28 -
.../tools/codeparser/ApiCodeConfig.java | 83 -
.../tools/codeparser/ApiCodeParser.java | 672 -
.../ApiCodeConfigParseException.java | 27 -
.../tools/exception/MapperParseException.java | 27 -
.../apidoc/tools/export/ApiDocExporter.java | 84 -
.../tools/export/ApiPostmanExporter.java | 53 -
.../apidoc/tools/util/FreeMarkerUtils.java | 28 -
.../src/main/resources/export-api-config.json | 24 -
.../main/resources/templates/api-doc.md.ftl | 144 -
.../templates/postman_collection.json.ftl | 42 -
.../resources/templates/postman_common.ftl | 120 -
.../framework/pom.xml | 17 -
.../orange-demo-single-service/pom.xml | 190 -
.../zz-resource/db-scripts/zzdemo-single.sql | 6858 --
.../docker-files/docker-compose.yml | 16 -
.../docker-files/services/redis/Dockerfile | 13 -
.../docker-files/services/redis/redis.conf | 1307 -
.../orange-demo-single-web/.browserslistrc | 2 -
.../orange-demo-single-web/.editorconfig | 5 -
.../orange-demo-single-web/.eslintignore | 2 -
.../orange-demo-single-web/.eslintrc.js | 39 -
.../orange-demo-single-web/.gitignore | 21 -
.../orange-demo-single-web/README.md | 15 -
.../orange-demo-single-web/babel.config.js | 5 -
.../orange-demo-single-web/jest.config.js | 3 -
.../orange-demo-single-web/package.json | 72 -
.../orange-demo-single-web/public/favicon.ico | Bin 4286 -> 0 bytes
.../img/icons/android-chrome-192x192.png | Bin 9416 -> 0 bytes
.../img/icons/android-chrome-512x512.png | Bin 29808 -> 0 bytes
.../icons/android-chrome-maskable-192x192.png | Bin 6401 -> 0 bytes
.../icons/android-chrome-maskable-512x512.png | Bin 23038 -> 0 bytes
.../img/icons/apple-touch-icon-120x120.png | Bin 3369 -> 0 bytes
.../img/icons/apple-touch-icon-152x152.png | Bin 4046 -> 0 bytes
.../img/icons/apple-touch-icon-180x180.png | Bin 4678 -> 0 bytes
.../img/icons/apple-touch-icon-60x60.png | Bin 1491 -> 0 bytes
.../img/icons/apple-touch-icon-76x76.png | Bin 1823 -> 0 bytes
.../public/img/icons/apple-touch-icon.png | Bin 4678 -> 0 bytes
.../public/img/icons/favicon-16x16.png | Bin 799 -> 0 bytes
.../public/img/icons/favicon-32x32.png | Bin 1271 -> 0 bytes
.../img/icons/msapplication-icon-144x144.png | Bin 1169 -> 0 bytes
.../public/img/icons/mstile-150x150.png | Bin 4282 -> 0 bytes
.../public/img/icons/safari-pinned-tab.svg | 149 -
.../orange-demo-single-web/public/index.html | 16 -
.../orange-demo-single-web/public/robots.txt | 2 -
.../orange-demo-single-web/src/App.vue | 21 -
.../src/api/Controller/CourseController.js | 25 -
.../Controller/CourseTransStatsController.js | 17 -
.../api/Controller/DictionaryController.js | 185 -
.../StudentActionStatsController.js | 17 -
.../StudentActionTransController.js | 25 -
.../api/Controller/StudentClassController.js | 65 -
.../src/api/Controller/StudentController.js | 25 -
.../api/Controller/SysDataPermController.js | 61 -
.../src/api/Controller/SysDeptController.js | 25 -
.../src/api/Controller/SysUserController.js | 25 -
.../src/api/Controller/SystemController.js | 260 -
.../orange-demo-single-web/src/api/index.js | 25 -
.../src/assets/element-variables-blue.scss | 1014 -
.../src/assets/element-variables-dark.scss | 1000 -
.../src/assets/element-variables-green.scss | 1000 -
.../src/assets/element-variables-light.scss | 998 -
.../src/assets/element-variables-orange.scss | 1001 -
.../src/assets/img/default-header.jpg | Bin 14882 -> 0 bytes
.../src/assets/img/default.jpg | Bin 20200 -> 0 bytes
.../src/assets/img/login.png | Bin 728962 -> 0 bytes
.../src/assets/img/login_bg.jpg | Bin 494030 -> 0 bytes
.../src/assets/img/login_logo.png | Bin 16011 -> 0 bytes
.../src/assets/img/logo.jpg | Bin 19013 -> 0 bytes
.../src/assets/img/logo.png | Bin 9808 -> 0 bytes
.../src/assets/img/orange-group1.png | Bin 10894 -> 0 bytes
.../src/assets/img/orange-group2.png | Bin 4705 -> 0 bytes
.../src/assets/package.json | 13 -
.../src/assets/style/base.scss | 677 -
.../src/assets/style/element-variables.scss | 5 -
.../src/assets/style/form-style.scss | 117 -
.../src/assets/style/index.scss | 3 -
.../src/assets/style/transition.scss | 31 -
.../src/assets/theme/alert.css | 343 -
.../src/assets/theme/aside.css | 136 -
.../src/assets/theme/autocomplete.css | 1467 -
.../src/assets/theme/avatar.css | 284 -
.../src/assets/theme/backtop.css | 273 -
.../src/assets/theme/badge.css | 290 -
.../src/assets/theme/base.css | 1244 -
.../src/assets/theme/breadcrumb-item.css | 0
.../src/assets/theme/breadcrumb.css | 287 -
.../src/assets/theme/button-group.css | 0
.../src/assets/theme/button.css | 762 -
.../src/assets/theme/calendar.css | 1065 -
.../src/assets/theme/card.css | 271 -
.../src/assets/theme/carousel-item.css | 291 -
.../src/assets/theme/carousel.css | 367 -
.../src/assets/theme/cascader-panel.css | 1781 -
.../src/assets/theme/cascader.css | 3504 -
.../src/assets/theme/checkbox-button.css | 0
.../src/assets/theme/checkbox-group.css | 0
.../src/assets/theme/checkbox.css | 636 -
.../src/assets/theme/col.css | 1877 -
.../src/assets/theme/collapse-item.css | 0
.../src/assets/theme/collapse.css | 543 -
.../src/assets/theme/color-picker.css | 545 -
.../src/assets/theme/container.css | 151 -
.../src/assets/theme/date-picker.css | 3698 -
.../src/assets/theme/dialog.css | 651 -
.../src/assets/theme/display.css | 293 -
.../src/assets/theme/divider.css | 284 -
.../src/assets/theme/drawer.css | 503 -
.../src/assets/theme/dropdown-item.css | 0
.../src/assets/theme/dropdown-menu.css | 0
.../src/assets/theme/dropdown.css | 1451 -
.../assets/theme/element-variables-blue.css | 120 -
.../assets/theme/element-variables-dark.css | 120 -
.../assets/theme/element-variables-green.css | 120 -
.../assets/theme/element-variables-light.css | 120 -
.../assets/theme/element-variables-orange.css | 120 -
.../src/assets/theme/element-variables.css | 120 -
.../src/assets/theme/fonts/element-icons.ttf | Bin 55956 -> 0 bytes
.../src/assets/theme/fonts/element-icons.woff | Bin 28200 -> 0 bytes
.../src/assets/theme/footer.css | 256 -
.../src/assets/theme/form-item.css | 0
.../src/assets/theme/form.css | 364 -
.../src/assets/theme/header.css | 256 -
.../src/assets/theme/icon.css | 1008 -
.../src/assets/theme/image.css | 443 -
.../src/assets/theme/index.css | 57046 ----------------
.../src/assets/theme/infinite-scroll.css | 0
.../src/assets/theme/infiniteScroll.css | 0
.../src/assets/theme/input-number.css | 891 -
.../src/assets/theme/input.css | 534 -
.../src/assets/theme/link.css | 342 -
.../src/assets/theme/loading.css | 336 -
.../src/assets/theme/main.css | 261 -
.../src/assets/theme/menu-item-group.css | 0
.../src/assets/theme/menu-item.css | 0
.../src/assets/theme/menu.css | 719 -
.../src/assets/theme/message-box.css | 2018 -
.../src/assets/theme/message.css | 336 -
.../src/assets/theme/notification.css | 323 -
.../src/assets/theme/option-group.css | 276 -
.../src/assets/theme/option.css | 273 -
.../src/assets/theme/page-header.css | 283 -
.../src/assets/theme/pagination.css | 3275 -
.../src/assets/theme/popconfirm.css | 264 -
.../src/assets/theme/popover.css | 605 -
.../src/assets/theme/popper.css | 328 -
.../src/assets/theme/progress.css | 349 -
.../src/assets/theme/radio-button.css | 458 -
.../src/assets/theme/radio-group.css | 255 -
.../src/assets/theme/radio.css | 509 -
.../src/assets/theme/rate.css | 284 -
.../src/assets/theme/reset.css | 174 -
.../src/assets/theme/row.css | 289 -
.../src/assets/theme/scrollbar.css | 296 -
.../src/assets/theme/select-dropdown.css | 623 -
.../src/assets/theme/select.css | 2825 -
.../src/assets/theme/slider.css | 1677 -
.../src/assets/theme/spinner.css | 180 -
.../src/assets/theme/step.css | 485 -
.../src/assets/theme/steps.css | 146 -
.../src/assets/theme/submenu.css | 0
.../src/assets/theme/switch.css | 333 -
.../src/assets/theme/tab-pane.css | 0
.../src/assets/theme/table-column.css | 1410 -
.../src/assets/theme/table.css | 2047 -
.../src/assets/theme/tabs.css | 831 -
.../src/assets/theme/tag.css | 462 -
.../src/assets/theme/time-picker.css | 2523 -
.../src/assets/theme/time-select.css | 1918 -
.../src/assets/theme/timeline-item.css | 318 -
.../src/assets/theme/timeline.css | 256 -
.../src/assets/theme/tooltip.css | 342 -
.../src/assets/theme/transfer.css | 2349 -
.../src/assets/theme/tree.css | 1210 -
.../src/assets/theme/upload.css | 1045 -
.../src/components/DateRange/index.vue | 305 -
.../src/components/Dialog/index.js | 77 -
.../src/components/FilterBox/index.vue | 134 -
.../src/components/Hamburger/index.vue | 44 -
.../src/components/IconSelect/icon.json | 280 -
.../src/components/IconSelect/index.vue | 104 -
.../src/components/InputNumberRange/index.vue | 227 -
.../src/components/Progress/index.vue | 44 -
.../src/components/RichEditor/index.vue | 132 -
.../components/TableProgressColumn/index.vue | 119 -
.../src/components/TreeSelect/index.vue | 290 -
.../src/components/Verifition/Verify.vue | 494 -
.../Verifition/Verify/VerifyPoints.vue | 268 -
.../Verifition/Verify/VerifySlide.vue | 381 -
.../src/components/Verifition/api/index.js | 25 -
.../src/components/Verifition/utils/ase.js | 11 -
.../src/components/Verifition/utils/axios.js | 31 -
.../src/components/Verifition/utils/util.js | 36 -
.../src/core/config/development.js | 4 -
.../src/core/config/index.js | 18 -
.../src/core/config/production.js | 4 -
.../src/core/directive/sortable.js | 14 -
.../src/core/directive/sortableData.js | 60 -
.../src/core/http/index.js | 244 -
.../src/core/http/request.js | 75 -
.../src/core/http/requestUrl.js | 27 -
.../src/core/mixins/global.js | 117 -
.../src/core/mixins/index.js | 299 -
.../orange-demo-single-web/src/main.js | 39 -
.../src/registerServiceWorker.js | 32 -
.../src/router/import-development.js | 1 -
.../src/router/import-production.js | 1 -
.../src/router/index.js | 41 -
.../src/router/systemRouters.js | 101 -
.../src/staticDict/index.js | 461 -
.../src/store/actions.js | 16 -
.../src/store/getters.js | 89 -
.../orange-demo-single-web/src/store/index.js | 15 -
.../src/store/mutations.js | 171 -
.../orange-demo-single-web/src/store/state.js | 32 -
.../src/store/utils/index.js | 52 -
.../src/utils/chartOption.js | 56 -
.../orange-demo-single-web/src/utils/index.js | 447 -
.../src/utils/validate.js | 33 -
.../src/utils/widget.js | 322 -
.../src/views/generated/formClass.vue | 587 -
.../src/views/generated/formCourse.vue | 316 -
.../src/views/generated/formCourseStats.vue | 346 -
.../src/views/generated/formCreateClass.vue | 290 -
.../src/views/generated/formCreateCourse.vue | 344 -
.../src/views/generated/formCreateStudent.vue | 455 -
.../src/views/generated/formEditClass.vue | 332 -
.../generated/formEditClassCourseOrder.vue | 200 -
.../src/views/generated/formEditCourse.vue | 392 -
.../src/views/generated/formEditStudent.vue | 575 -
.../views/generated/formSetClassCourse.vue | 298 -
.../views/generated/formSetClassStudent.vue | 223 -
.../src/views/generated/formStudent.vue | 310 -
.../generated/formStudentActionDetail.vue | 253 -
.../generated/formStudentActionStats.vue | 328 -
.../layout/components/breadcrumb/index.vue | 53 -
.../components/formModifyHeadImage/index.vue | 76 -
.../components/formModifyPassword/index.vue | 98 -
.../layout/components/sidebar/menu-item.vue | 59 -
.../layout/components/sidebar/sidebar.vue | 82 -
.../views/layout/components/tags/tagItem.vue | 79 -
.../views/layout/components/tags/tagPanel.vue | 213 -
.../src/views/layout/index.vue | 205 -
.../src/views/login/index.vue | 148 -
.../views/upms/formDictManagement/index.vue | 207 -
.../src/views/upms/formEditDict/index.vue | 110 -
.../views/upms/formEditSysDataPerm/index.vue | 243 -
.../src/views/upms/formEditSysDept/index.vue | 201 -
.../views/upms/formEditSysMenu/editColumn.vue | 108 -
.../src/views/upms/formEditSysMenu/index.vue | 283 -
.../src/views/upms/formEditSysPerm/index.vue | 168 -
.../views/upms/formEditSysPermCode/index.vue | 221 -
.../upms/formEditSysPermModule/index.vue | 184 -
.../src/views/upms/formEditSysRole/index.vue | 158 -
.../src/views/upms/formEditSysUser/index.vue | 226 -
.../src/views/upms/formMenuPerm/index.vue | 150 -
.../src/views/upms/formSetRoleUsers/index.vue | 216 -
.../upms/formSetSysDataPermUser/index.vue | 216 -
.../src/views/upms/formSysDataPerm/index.vue | 489 -
.../src/views/upms/formSysDept/index.vue | 190 -
.../src/views/upms/formSysLoginUser/index.vue | 151 -
.../upms/formSysMenu/formSysColumnMenu.vue | 307 -
.../upms/formSysMenu/formSysMenuPerm.vue | 203 -
.../src/views/upms/formSysMenu/index.vue | 241 -
.../views/upms/formSysOperationLog/index.vue | 220 -
.../upms/formSysPerm/formSysPermDetail.vue | 323 -
.../src/views/upms/formSysPerm/index.vue | 412 -
.../formSysPermCode/formSysPermCodeDetail.vue | 253 -
.../src/views/upms/formSysPermCode/index.vue | 275 -
.../upms/formSysRole/formSysRolePerm.vue | 264 -
.../src/views/upms/formSysRole/index.vue | 483 -
.../upms/formSysUser/formSysUserPerm.vue | 335 -
.../src/views/upms/formSysUser/index.vue | 287 -
.../upms/formViewSysOperationLog/index.vue | 120 -
.../src/views/welcome/index.vue | 161 -
.../orange-demo-single-web/static/.gitkeep | 0
.../orange-demo-single-web/vue.config.js | 5 -
668 files changed, 186753 deletions(-)
delete mode 100644 orange-demo-single/orange-demo-single-service/.gitignore
delete mode 100644 orange-demo-single/orange-demo-single-service/README.md
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/GradeVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionStatsVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentActionTransVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentClassVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/StudentVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysOperationLogController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserRoleMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysOperationLogDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPerm.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermDept.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermUser.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDept.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptRelation.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenu.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenuPermCode.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPerm.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCode.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCodePerm.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermModule.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermWhitelist.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRole.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRoleMenu.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUser.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserRole.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysMenuType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysOnlineMenuPermType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermCodeType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermModuleType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserStatus.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDataPermService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysDeptService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysMenuService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermCodeService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermModuleService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysPermWhitelistService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysRoleService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/SysUserService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDataPermServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysDeptServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysMenuServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermCodeServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermModuleServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysPermWhitelistServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysRoleServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/SysUserServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermDeptVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDataPermVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysDeptVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysMenuVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysOperationLogVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermCodeVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermModuleVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysPermVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysRoleVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/vo/SysUserVo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application-dev.yml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/application.yml
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg1.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg10.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg11.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg12.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg13.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg14.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg15.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg16.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg17.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg18.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg19.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg2.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg20.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg3.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg4.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg5.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg6.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg7.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg8.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/original/bg9.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/1.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/10.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/11.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/2.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/3.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/4.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/5.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/6.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/7.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/8.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/jigsaw/slidingBlock/9.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg1.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg2.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg3.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg4.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg5.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg6.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg7.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg8.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/images/pic-click/bg9.png
delete mode 100644 orange-demo-single/orange-demo-single-service/application-webadmin/src/main/resources/logback-spring.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyControllerAdvice.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/advice/MyExceptionHandler.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DeptFilterColumn.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableDataFilter.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/DisableTenantFilter.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/EnableDataPerm.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/JobUpdateTimeColumn.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSource.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyDataSourceResolver.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/MyRequestBody.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/NoAuthInterface.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationConstDict.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationDict.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToMany.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationManyToManyAggregation.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToMany.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToManyAggregation.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/RelationOneToOne.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/TenantFilterColumn.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UploadFlagColumn.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/annotation/UserFilterColumn.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceAspect.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DataSourceResolveAspect.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/aop/DictCacheSyncAspect.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/dao/BaseDaoMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/BaseModelMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/mapper/DummyModelMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseDictService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/BaseService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseDictService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/base/service/IBaseService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/DictionaryCache.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapDictionaryCache.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/cache/MapTreeDictionaryCache.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/CommonWebMvcConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/CoreProperties.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DataSourceContextHolder.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/DynamicDataSource.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/EncryptConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/RestTemplateConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/config/TomcatConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AggregationType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/AppDeviceType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ApplicationConstant.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/ErrorCodeEnum.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/constant/GlobalDeletedFlag.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/DataValidationException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidClassFieldException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataFieldException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidDataModelException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/InvalidRedisModeException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MapCacheAccessException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/MyRuntimeException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataAffectException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/NoDataPermException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/exception/RedisCacheAccessException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/interceptor/MyRequestArgumentResolver.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/listener/LoadServiceRelationListener.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/CallResult.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/DummyClass.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/GlobalThreadLocal.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/LoginUserInfo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupCriteria.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyGroupParam.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyOrderParam.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageData.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyPageParam.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyRelationParam.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/MyWhereCriteria.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/ResponseResult.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TableModelInfo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/TokenData.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/object/Tuple2.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/BaseUpDownloader.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/LocalUpDownloader.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UpDownloaderFactory.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadResponseInfo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreInfo.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/upload/UploadStoreTypeEnum.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/AopTargetUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ApplicationContextHolder.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ContextUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/DataSourceResolver.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ExportUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/ImportUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/IpUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/JwtUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/LogMessageUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyCommonUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyDateUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyModelUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/MyPageUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RedisKeyUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/RsaUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/util/TreeNode.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/AddGroup.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictRef.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/ConstDictValidator.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLength.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/TextLengthValidator.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-core/src/main/java/com/orangeforms/common/core/validator/UpdateGroup.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/aop/DisableDataFilterAspect.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterAutoConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterProperties.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/config/DataFilterWebMvcConfigurer.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/constant/DataPermRuleType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/DataFilterInterceptor.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/interceptor/MybatisDataFilterInterceptor.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/java/com/orangeforms/common/datafilter/listener/LoadDataFilterInfoListener.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-datafilter/src/main/resources/META-INF/spring.factories
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/annotation/OperationLog.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/aop/OperationLogAspect.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/CommonLogAutoConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/config/OperationLogProperties.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/SysOperationLogMapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/dao/mapper/SysOperationLogMapper.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/SysOperationLog.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/model/constant/SysOperationLogType.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/SysOperationLogService.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/java/com/orangeforms/common/log/service/impl/SysOperationLogServiceImpl.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-log/src/main/resources/META-INF/spring.factories
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisDictionaryCache.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedisTreeDictionaryCache.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/RedissonCacheConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/cache/SessionCacheHelper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/java/com/orangeforms/common/redis/config/RedissonConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorAutoConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/config/IdGeneratorProperties.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/BasicIdGenerator.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/generator/MyIdGenerator.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/java/com/orangeforms/common/sequence/wrapper/IdGeneratorWrapper.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-sequence/src/main/resources/META-INF/spring.factories
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerAutoConfiguration.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/config/SwaggerProperties.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/ByteBuddyUtil.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyModelPlugin.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/java/com/orangeforms/common/swagger/plugin/DynamicBodyParameterBuilder.java
delete mode 100644 orange-demo-single/orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories
delete mode 100644 orange-demo-single/orange-demo-single-service/common/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportApiApp.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/ExportDocApp.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeConfig.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/codeparser/ApiCodeParser.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/ApiCodeConfigParseException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/exception/MapperParseException.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiDocExporter.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/export/ApiPostmanExporter.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/java/com/orangeforms/apidoc/tools/util/FreeMarkerUtils.java
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/export-api-config.json
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/templates/api-doc.md.ftl
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/templates/postman_collection.json.ftl
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/apidoc-tools/src/main/resources/templates/postman_common.ftl
delete mode 100644 orange-demo-single/orange-demo-single-service/framework/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/pom.xml
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/docker-files/docker-compose.yml
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/docker-files/services/redis/Dockerfile
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/docker-files/services/redis/redis.conf
delete mode 100644 orange-demo-single/orange-demo-single-web/.browserslistrc
delete mode 100644 orange-demo-single/orange-demo-single-web/.editorconfig
delete mode 100644 orange-demo-single/orange-demo-single-web/.eslintignore
delete mode 100644 orange-demo-single/orange-demo-single-web/.eslintrc.js
delete mode 100644 orange-demo-single/orange-demo-single-web/.gitignore
delete mode 100644 orange-demo-single/orange-demo-single-web/README.md
delete mode 100644 orange-demo-single/orange-demo-single-web/babel.config.js
delete mode 100644 orange-demo-single/orange-demo-single-web/jest.config.js
delete mode 100644 orange-demo-single/orange-demo-single-web/package.json
delete mode 100644 orange-demo-single/orange-demo-single-web/public/favicon.ico
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/android-chrome-192x192.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/android-chrome-512x512.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/android-chrome-maskable-192x192.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/android-chrome-maskable-512x512.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon-120x120.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon-152x152.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon-180x180.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon-60x60.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon-76x76.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/apple-touch-icon.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/favicon-16x16.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/favicon-32x32.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/msapplication-icon-144x144.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/mstile-150x150.png
delete mode 100644 orange-demo-single/orange-demo-single-web/public/img/icons/safari-pinned-tab.svg
delete mode 100644 orange-demo-single/orange-demo-single-web/public/index.html
delete mode 100644 orange-demo-single/orange-demo-single-web/public/robots.txt
delete mode 100644 orange-demo-single/orange-demo-single-web/src/App.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/CourseController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/CourseTransStatsController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/DictionaryController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/StudentActionStatsController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/StudentActionTransController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/StudentClassController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/StudentController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/SysDataPermController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/SysDeptController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/SysUserController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/Controller/SystemController.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/api/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/element-variables-blue.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/element-variables-dark.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/element-variables-green.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/element-variables-light.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/element-variables-orange.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/default-header.jpg
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/default.jpg
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/login.png
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/login_bg.jpg
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/login_logo.png
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/logo.jpg
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/logo.png
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/orange-group1.png
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/img/orange-group2.png
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/package.json
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/style/base.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/style/element-variables.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/style/form-style.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/style/index.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/style/transition.scss
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/alert.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/aside.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/autocomplete.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/avatar.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/backtop.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/badge.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/base.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/breadcrumb-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/breadcrumb.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/button-group.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/button.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/calendar.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/card.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/carousel-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/carousel.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/cascader-panel.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/cascader.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/checkbox-button.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/checkbox-group.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/checkbox.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/col.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/collapse-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/collapse.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/color-picker.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/container.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/date-picker.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/dialog.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/display.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/divider.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/drawer.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/dropdown-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/dropdown-menu.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/dropdown.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables-blue.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables-dark.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables-green.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables-light.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables-orange.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/element-variables.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/fonts/element-icons.ttf
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/fonts/element-icons.woff
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/footer.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/form-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/form.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/header.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/icon.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/image.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/index.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/infinite-scroll.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/infiniteScroll.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/input-number.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/input.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/link.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/loading.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/main.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/menu-item-group.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/menu-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/menu.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/message-box.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/message.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/notification.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/option-group.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/option.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/page-header.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/pagination.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/popconfirm.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/popover.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/popper.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/progress.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/radio-button.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/radio-group.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/radio.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/rate.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/reset.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/row.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/scrollbar.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/select-dropdown.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/select.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/slider.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/spinner.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/step.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/steps.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/submenu.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/switch.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/tab-pane.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/table-column.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/table.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/tabs.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/tag.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/time-picker.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/time-select.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/timeline-item.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/timeline.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/tooltip.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/transfer.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/tree.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/assets/theme/upload.css
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/DateRange/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Dialog/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/FilterBox/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Hamburger/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/IconSelect/icon.json
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/IconSelect/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/InputNumberRange/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Progress/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/RichEditor/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/TableProgressColumn/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/TreeSelect/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/Verify.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/Verify/VerifyPoints.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/Verify/VerifySlide.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/api/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/utils/ase.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/utils/axios.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/components/Verifition/utils/util.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/config/development.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/config/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/config/production.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/directive/sortable.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/directive/sortableData.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/http/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/http/request.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/http/requestUrl.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/mixins/global.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/core/mixins/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/main.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/registerServiceWorker.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/router/import-development.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/router/import-production.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/router/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/router/systemRouters.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/staticDict/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/actions.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/getters.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/mutations.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/state.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/store/utils/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/utils/chartOption.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/utils/index.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/utils/validate.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/utils/widget.js
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formClass.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formCourse.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formCourseStats.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formCreateClass.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formCreateCourse.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formCreateStudent.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formEditClass.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formEditClassCourseOrder.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formEditCourse.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formEditStudent.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formSetClassCourse.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formSetClassStudent.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formStudent.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formStudentActionDetail.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/generated/formStudentActionStats.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/breadcrumb/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/formModifyHeadImage/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/formModifyPassword/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/sidebar/menu-item.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/sidebar/sidebar.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/tags/tagItem.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/components/tags/tagPanel.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/layout/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/login/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formDictManagement/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditDict/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysDataPerm/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysDept/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysMenu/editColumn.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysMenu/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysPerm/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysPermCode/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysPermModule/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysRole/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formEditSysUser/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formMenuPerm/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSetRoleUsers/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSetSysDataPermUser/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysDataPerm/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysDept/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysLoginUser/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysMenu/formSysColumnMenu.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysMenu/formSysMenuPerm.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysMenu/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysOperationLog/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysPerm/formSysPermDetail.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysPerm/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysPermCode/formSysPermCodeDetail.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysPermCode/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysRole/formSysRolePerm.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysRole/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysUser/formSysUserPerm.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formSysUser/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/upms/formViewSysOperationLog/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/src/views/welcome/index.vue
delete mode 100644 orange-demo-single/orange-demo-single-web/static/.gitkeep
delete mode 100644 orange-demo-single/orange-demo-single-web/vue.config.js
diff --git a/orange-demo-single/orange-demo-single-service/.gitignore b/orange-demo-single/orange-demo-single-service/.gitignore
deleted file mode 100644
index e3fa94cd..00000000
--- a/orange-demo-single/orange-demo-single-service/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-/.mvn/*
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/build/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/README.md b/orange-demo-single/orange-demo-single-service/README.md
deleted file mode 100644
index 20274fd0..00000000
--- a/orange-demo-single/orange-demo-single-service/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-### 服务接口文档
----
-- Knife4j
- - 服务启动后，Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus)
-- Postman
- - 无需启动服务，即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下，找到ExportApiApp文件，并执行main函数。
-
-### 服务启动环境依赖
----
-
-执行docker-compose up -d 命令启动下面依赖的服务。
-执行docker-compose down 命令停止下面服务。
-
-- Redis
- - 版本：4
- - 端口: 6379
- - 推荐客户端工具 [AnotherRedisDesktopManager](https://github.com/qishibo/AnotherRedisDesktopManager)
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
deleted file mode 100644
index 23cbd36e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- com.orangeforms
- OrangeSingleDemo
- 1.0.0
-
- 4.0.0
-
- application-common
- 1.0.0
- application-common
- jar
-
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index 15b21b8b..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/DeviceType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 设备类型常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class DeviceType {
-
- /**
- * iOS。
- */
- public static final int IOS = 0;
- /**
- * Android。
- */
- public static final int ANDROID = 1;
- /**
- * PC。
- */
- public static final int PC = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(IOS, "iOS");
- DICT_MAP.put(ANDROID, "Android");
- DICT_MAP.put(PC, "PC");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private DeviceType() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index 1ab88021..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/ExpLevel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 经验等级常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class ExpLevel {
-
- /**
- * 初级学员。
- */
- public static final int LOWER = 0;
- /**
- * 中级学员。
- */
- public static final int MIDDLE = 1;
- /**
- * 高级学员。
- */
- public static final int HIGH = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(LOWER, "初级学员");
- DICT_MAP.put(MIDDLE, "中级学员");
- DICT_MAP.put(HIGH, "高级学员");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private ExpLevel() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index 412e340b..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Gender.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 性别常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class Gender {
-
- /**
- * 男。
- */
- public static final int MALE = 1;
- /**
- * 女。
- */
- public static final int FEMALE = 0;
-
- private static final Map DICT_MAP = new HashMap<>(2);
- static {
- DICT_MAP.put(MALE, "男");
- DICT_MAP.put(FEMALE, "女");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private Gender() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index 15163405..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentActionType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 学生行为常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class StudentActionType {
-
- /**
- * 充值。
- */
- public static final int RECHARGE = 0;
- /**
- * 购课。
- */
- public static final int BUY_COURSE = 1;
- /**
- * 上课签到。
- */
- public static final int SIGNIN_COURSE = 2;
- /**
- * 上课签退。
- */
- public static final int SIGNOUT_COURSE = 3;
- /**
- * 看视频课。
- */
- public static final int WATCH_VIDEO = 4;
- /**
- * 做作业。
- */
- public static final int DO_PAPER = 5;
- /**
- * 刷题。
- */
- public static final int REFRESH_EXERCISE = 6;
- /**
- * 献花。
- */
- public static final int PRESENT_FLOWER = 7;
- /**
- * 购买视频。
- */
- public static final int BUY_VIDEO_COURSE = 8;
- /**
- * 购买鲜花。
- */
- public static final int BUY_FLOWER = 9;
- /**
- * 购买作业。
- */
- public static final int BUY_PAPER = 10;
-
- private static final Map DICT_MAP = new HashMap<>(11);
- static {
- DICT_MAP.put(RECHARGE, "充值");
- DICT_MAP.put(BUY_COURSE, "购课");
- DICT_MAP.put(SIGNIN_COURSE, "上课签到");
- DICT_MAP.put(SIGNOUT_COURSE, "上课签退");
- DICT_MAP.put(WATCH_VIDEO, "看视频课");
- DICT_MAP.put(DO_PAPER, "做作业");
- DICT_MAP.put(REFRESH_EXERCISE, "刷题");
- DICT_MAP.put(PRESENT_FLOWER, "献花");
- DICT_MAP.put(BUY_VIDEO_COURSE, "购买视频");
- DICT_MAP.put(BUY_FLOWER, "购买鲜花");
- DICT_MAP.put(BUY_PAPER, "购买作业");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private StudentActionType() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index fa087cc6..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/StudentStatus.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 学生状态常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class StudentStatus {
-
- /**
- * 正常。
- */
- public static final int NORMAL = 0;
- /**
- * 锁定。
- */
- public static final int LOCKED = 1;
- /**
- * 注销。
- */
- public static final int DELETED = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(NORMAL, "正常");
- DICT_MAP.put(LOCKED, "锁定");
- DICT_MAP.put(DELETED, "注销");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private StudentStatus() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/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
deleted file mode 100644
index 00c859d4..00000000
--- a/orange-demo-single/orange-demo-single-service/application-common/src/main/java/com/orangeforms/application/common/constant/Subject.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.application.common.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 学科常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class Subject {
-
- /**
- * 语文。
- */
- public static final int CHINESE = 0;
- /**
- * 数学。
- */
- public static final int MATCH = 1;
- /**
- * 英语。
- */
- public static final int ENGLISH = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(CHINESE, "语文");
- DICT_MAP.put(MATCH, "数学");
- DICT_MAP.put(ENGLISH, "英语");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private Subject() {
- }
-}
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
deleted file mode 100644
index 1902498e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- com.orangeforms
- OrangeSingleDemo
- 1.0.0
-
- 4.0.0
-
- application-webadmin
- 1.0.0
- application
- jar
-
-
-
- com.anji-plus
- spring-boot-starter-captcha
- ${ajcaptcha.version}
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
- spring-boot-starter-logging
- org.springframework.boot
-
-
-
-
-
- com.orangeforms
- common-redis
- 1.0.0
-
-
- com.orangeforms
- common-log
- 1.0.0
-
-
- com.orangeforms
- common-sequence
- 1.0.0
-
-
- com.orangeforms
- common-datafilter
- 1.0.0
-
-
- com.orangeforms
- application-common
- 1.0.0
-
-
- com.orangeforms
- common-swagger
- 1.0.0
-
-
-
-
-
-
- src/main/resources
-
- **/*.*
-
- false
-
-
- src/main/java
-
- **/*.xml
-
- false
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- ${spring-boot.version}
-
-
-
- repackage
-
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
deleted file mode 100644
index 8e456cec..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orangeforms.webadmin;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * 应用服务启动类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@EnableAsync
-@SpringBootApplication
-@ComponentScan("com.orangeforms")
-public class WebAdminApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(WebAdminApplication.class, args);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index ef96a4b1..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import io.swagger.annotations.Api;
-import cn.jimmyshi.beanquery.BeanQuery;
-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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.*;
-
-/**
- * 行政区划数据访问接口类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "行政区划数据访问接口")
-@RestController
-@RequestMapping("/admin/app/areaCode")
-public class AreaCodeController {
-
- @Autowired
- private AreaCodeService areaCodeService;
-
- /**
- * 按照字典的形式返回行政区划列表。
- *
- * @return 字典形式的行政区划列表。
- */
- @GetMapping("/listDict")
- public ResponseResult>> listDict() {
- List resultList = areaCodeService.getAllListFromCache();
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-
- /**
- * 根据上级行政区划Id获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 按照字典的形式返回下级行政区划列表。
- */
- @GetMapping("/listDictByParentId")
- public ResponseResult>> listDictByParentId(@RequestParam(required = false) Long parentId) {
- Collection resultList = areaCodeService.getListByParentId(parentId);
- if (CollectionUtils.isEmpty(resultList)) {
- return ResponseResult.success(new LinkedList<>());
- }
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-
- /**
- * 根据字典Id集合，获取查询后的字典数据。
- *
- * @param dictIds 字典Id集合。
- * @return 字典形式的行政区划列表。
- */
- @PostMapping("/listDictByIds")
- public ResponseResult>> listDictByIds(
- @MyRequestBody(elementType = Long.class) List dictIds) {
- List resultList = areaCodeService.getInList(new HashSet<>(dictIds));
- return ResponseResult.success(BeanQuery.select(
- "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 15e71524..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseController.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import cn.jimmyshi.beanquery.BeanQuery;
-import cn.hutool.core.util.ReflectUtil;
-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.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.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-
-/**
- * 课程数据操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "课程数据管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/course")
-public class CourseController {
-
- @Autowired
- private CourseService courseService;
- @Autowired
- private ApplicationConfig appConfig;
- @Autowired
- private SessionCacheHelper cacheHelper;
- @Autowired
- private UpDownloaderFactory upDownloaderFactory;
-
- /**
- * 新增课程数据数据。
- *
- * @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) {
- String errorMessage = MyCommonUtil.getModelValidationError(courseDto, false);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Course course = MyModelUtil.copyTo(courseDto, Course.class);
- // 验证关联Id的数据合法性
- CallResult callResult = courseService.verifyRelatedData(course, null);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- course = courseService.saveNew(course);
- return ResponseResult.success(course.getCourseId());
- }
-
- /**
- * 更新课程数据数据。
- *
- * @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) {
- String errorMessage = MyCommonUtil.getModelValidationError(courseDto, true);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Course course = MyModelUtil.copyTo(courseDto, Course.class);
- Course originalCourse = courseService.getById(course.getCourseId());
- if (originalCourse == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- // 验证关联Id的数据合法性
- CallResult callResult = courseService.verifyRelatedData(course, originalCourse);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- if (!courseService.update(course, originalCourse)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 删除课程数据数据。
- *
- * @param courseId 删除对象主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE)
- @PostMapping("/delete")
- public ResponseResult delete(@MyRequestBody Long courseId) {
- String errorMessage;
- if (MyCommonUtil.existBlankArgument(courseId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- return this.doDelete(courseId);
- }
-
- /**
- * 列出符合过滤条件的课程数据列表。
- *
- * @param courseDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody CourseDto courseDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Course courseFilter = MyModelUtil.copyTo(courseDtoFilter, Course.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Course.class);
- List courseList = courseService.getCourseListWithRelation(courseFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE));
- }
-
- /**
- * 查看指定课程数据对象详情。
- *
- * @param courseId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long courseId) {
- if (MyCommonUtil.existBlankArgument(courseId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- Course course = courseService.getByIdWithRelation(courseId, MyRelationParam.full());
- if (course == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- CourseVo courseVo = Course.INSTANCE.fromModel(course);
- return ResponseResult.success(courseVo);
- }
-
- /**
- * 附件文件下载。
- * 这里将图片和其他类型的附件文件放到不同的父目录下，主要为了便于今后图片文件的迁移。
- *
- * @param courseId 附件所在记录的主键Id。
- * @param fieldName 附件所属的字段名。
- * @param filename 文件名。如果没有提供该参数，就从当前记录的指定字段中读取。
- * @param asImage 下载文件是否为图片。
- * @param response Http 应答对象。
- */
- @OperationLog(type = SysOperationLogType.DOWNLOAD, saveResponse = false)
- @GetMapping("/download")
- public void download(
- @RequestParam(required = false) Long courseId,
- @RequestParam String fieldName,
- @RequestParam String filename,
- @RequestParam Boolean asImage,
- HttpServletResponse response) {
- if (MyCommonUtil.existBlankArgument(fieldName, filename, asImage)) {
- response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- return;
- }
- // 使用try来捕获异常，是为了保证一旦出现异常可以返回500的错误状态，便于调试。
- // 否则有可能给前端返回的是200的错误码。
- try {
- // 如果请求参数中没有包含主键Id，就判断该文件是否为当前session上传的。
- if (courseId == null) {
- if (!cacheHelper.existSessionUploadFile(filename)) {
- ResponseResult.output(HttpServletResponse.SC_FORBIDDEN);
- return;
- }
- } else {
- Course course = courseService.getById(courseId);
- if (course == null) {
- ResponseResult.output(HttpServletResponse.SC_NOT_FOUND);
- return;
- }
- String fieldJsonData = (String) ReflectUtil.getFieldValue(course, fieldName);
- if (fieldJsonData == null) {
- ResponseResult.output(HttpServletResponse.SC_BAD_REQUEST);
- return;
- }
- if (!BaseUpDownloader.containFile(fieldJsonData, filename)) {
- ResponseResult.output(HttpServletResponse.SC_FORBIDDEN);
- return;
- }
- }
- UploadStoreInfo storeInfo = MyModelUtil.getUploadStoreInfo(Course.class, fieldName);
- if (!storeInfo.isSupportUpload()) {
- ResponseResult.output(HttpServletResponse.SC_NOT_IMPLEMENTED,
- ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FIELD));
- return;
- }
- BaseUpDownloader upDownloader = upDownloaderFactory.get(storeInfo.getStoreType());
- upDownloader.doDownload(appConfig.getUploadFileBaseDir(),
- Course.class.getSimpleName(), fieldName, filename, asImage, response);
- } catch (Exception e) {
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- log.error(e.getMessage(), e);
- }
- }
-
- /**
- * 文件上传操作。
- *
- * @param fieldName 上传文件名。
- * @param asImage 是否作为图片上传。如果是图片，今后下载的时候无需权限验证。否则就是附件上传，下载时需要权限验证。
- * @param uploadFile 上传文件对象。
- */
- @OperationLog(type = SysOperationLogType.UPLOAD, saveResponse = false)
- @PostMapping("/upload")
- public void upload(
- @RequestParam String fieldName,
- @RequestParam Boolean asImage,
- @RequestParam("uploadFile") MultipartFile uploadFile) throws Exception {
- UploadStoreInfo storeInfo = MyModelUtil.getUploadStoreInfo(Course.class, fieldName);
- // 这里就会判断参数中指定的字段，是否支持上传操作。
- if (!storeInfo.isSupportUpload()) {
- ResponseResult.output(HttpServletResponse.SC_FORBIDDEN,
- ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FIELD));
- return;
- }
- // 根据字段注解中的存储类型，通过工厂方法获取匹配的上传下载实现类，从而解耦。
- BaseUpDownloader upDownloader = upDownloaderFactory.get(storeInfo.getStoreType());
- UploadResponseInfo responseInfo = upDownloader.doUpload(null,
- appConfig.getUploadFileBaseDir(), Course.class.getSimpleName(), fieldName, asImage, uploadFile);
- if (responseInfo.getUploadFailed()) {
- ResponseResult.output(HttpServletResponse.SC_FORBIDDEN,
- ResponseResult.error(ErrorCodeEnum.UPLOAD_FAILED, responseInfo.getErrorMessage()));
- return;
- }
- cacheHelper.putSessionUploadFile(responseInfo.getFilename());
- ResponseResult.output(ResponseResult.success(responseInfo));
- }
-
- /**
- * 以字典形式返回全部课程数据数据集合。字典的键值为[courseId, courseName]。
- * 白名单接口，登录用户均可访问。
- *
- * @param filter 过滤对象。
- * @return 应答结果对象，包含的数据为 List>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
- */
- @GetMapping("/listDict")
- public ResponseResult>> listDict(Course filter) {
- List resultList = courseService.getListByFilter(filter);
- return ResponseResult.success(BeanQuery.select(
- "courseId as id", "courseName as name").executeFrom(resultList));
- }
-
- /**
- * 根据字典Id集合，获取查询后的字典数据。
- *
- * @param dictIds 字典Id集合。
- * @return 应答结果对象，包含字典形式的数据集合。
- */
- @PostMapping("/listDictByIds")
- public ResponseResult>> listDictByIds(
- @MyRequestBody(elementType = Long.class) List dictIds) {
- List resultList = courseService.getInList(new HashSet<>(dictIds));
- return ResponseResult.success(BeanQuery.select(
- "courseId as id", "courseName as name").executeFrom(resultList));
- }
-
- private ResponseResult doDelete(Long courseId) {
- String errorMessage;
- // 验证关联Id的数据合法性
- Course originalCourse = courseService.getById(courseId);
- if (originalCourse == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- if (!courseService.remove(courseId)) {
- errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- return ResponseResult.success();
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 434a6fe4..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/CourseTransStatsController.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import com.github.pagehelper.page.PageMethod;
-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.*;
-
-import java.util.*;
-
-/**
- * 课程统计操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "课程统计管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/courseTransStats")
-public class CourseTransStatsController {
-
- @Autowired
- private CourseTransStatsService courseTransStatsService;
-
- /**
- * 列出符合过滤条件的课程统计列表。
- *
- * @param courseTransStatsDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody CourseTransStatsDto courseTransStatsDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- CourseTransStats courseTransStatsFilter = MyModelUtil.copyTo(courseTransStatsDtoFilter, CourseTransStats.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, CourseTransStats.class);
- List courseTransStatsList =
- courseTransStatsService.getCourseTransStatsListWithRelation(courseTransStatsFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(courseTransStatsList, CourseTransStats.INSTANCE));
- }
-
- /**
- * 分组列出符合过滤条件的课程统计列表。
- *
- * @param courseTransStatsDtoFilter 过滤对象。
- * @param groupParam 分组参数。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/listWithGroup")
- public ResponseResult> listWithGroup(
- @MyRequestBody CourseTransStatsDto courseTransStatsDtoFilter,
- @MyRequestBody(required = true) MyGroupParam groupParam,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- String orderBy = MyOrderParam.buildOrderBy(orderParam, CourseTransStats.class);
- groupParam = MyGroupParam.buildGroupBy(groupParam, CourseTransStats.class);
- if (groupParam == null) {
- return ResponseResult.error(
- ErrorCodeEnum.INVALID_ARGUMENT_FORMAT, "数据参数错误，分组参数不能为空！");
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- CourseTransStats filter = MyModelUtil.copyTo(courseTransStatsDtoFilter, CourseTransStats.class);
- MyGroupCriteria criteria = groupParam.getGroupCriteria();
- List resultList = courseTransStatsService.getGroupedCourseTransStatsListWithRelation(
- filter, criteria.getGroupSelect(), criteria.getGroupBy(), orderBy);
- // 分页连同对象数据转换copy工作，下面的方法一并完成。
- return ResponseResult.success(MyPageUtil.makeResponseData(resultList, CourseTransStats.INSTANCE));
- }
-
- /**
- * 查看指定课程统计对象详情。
- *
- * @param statsId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long statsId) {
- if (MyCommonUtil.existBlankArgument(statsId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- CourseTransStats courseTransStats = courseTransStatsService.getByIdWithRelation(statsId, MyRelationParam.full());
- if (courseTransStats == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- CourseTransStatsVo courseTransStatsVo = CourseTransStats.INSTANCE.fromModel(courseTransStats);
- return ResponseResult.success(courseTransStatsVo);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 6d664385..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/GradeController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import cn.jimmyshi.beanquery.BeanQuery;
-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;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.groups.Default;
-import java.util.*;
-
-/**
- * 年级操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "年级管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/grade")
-public class GradeController {
-
- @Autowired
- private GradeService gradeService;
-
- /**
- * 新增年级数据。
- *
- * @param gradeDto 新增对象。
- * @return 应答结果对象，包含新增对象主键Id。
- */
- @ApiOperationSupport(ignoreParameters = {"gradeDto.gradeId"})
- @OperationLog(type = SysOperationLogType.ADD)
- @PostMapping("/add")
- public ResponseResult add(@MyRequestBody GradeDto gradeDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(gradeDto);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Grade grade = MyModelUtil.copyTo(gradeDto, Grade.class);
- grade = gradeService.saveNew(grade);
- return ResponseResult.success(grade.getGradeId());
- }
-
- /**
- * 更新年级数据。
- *
- * @param gradeDto 更新对象。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.UPDATE)
- @PostMapping("/update")
- public ResponseResult update(@MyRequestBody GradeDto gradeDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(gradeDto, Default.class, UpdateGroup.class);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Grade grade = MyModelUtil.copyTo(gradeDto, Grade.class);
- Grade originalGrade = gradeService.getById(grade.getGradeId());
- if (originalGrade == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- if (!gradeService.update(grade, originalGrade)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 删除年级数据。
- *
- * @param gradeId 删除对象主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE)
- @PostMapping("/delete")
- public ResponseResult delete(@MyRequestBody Integer gradeId) {
- if (MyCommonUtil.existBlankArgument(gradeId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- if (!gradeService.remove(gradeId)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 白名单接口，登录用户均可访问。以字典形式返回全部年级数据集合。
- * 所有数据全部取自于缓存，对于数据库中存在，但是缓存中不存在的数据，不会返回。
- *
- * @return 应答结果对象，包含字典形式的数据集合。
- */
- @GetMapping("/listDict")
- public ResponseResult>> listDict() {
- List resultList = gradeService.getAllListFromCache();
- if (CollectionUtils.isEmpty(resultList)) {
- gradeService.reloadCachedData(true);
- resultList = gradeService.getAllList();
- }
- return ResponseResult.success(BeanQuery.select(
- "gradeId as id", "gradeName as name").executeFrom(resultList));
- }
-
- /**
- * 白名单接口，登录用户均可访问。以字典形式返回全部年级数据集合。
- * fullResultList中的字典列表全部取自于数据库，而cachedResultList全部取自于缓存，前端负责比对。
- *
- * @return 应答结果对象，包含字典形式的数据集合。
- */
- @GetMapping("/listAll")
- public ResponseResult listAll() {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("fullResultList", BeanQuery.select(
- "gradeId as id", "gradeName as name").executeFrom(gradeService.getAllList()));
- jsonObject.put("cachedResultList", BeanQuery.select(
- "gradeId as id", "gradeName as name").executeFrom(gradeService.getAllListFromCache()));
- return ResponseResult.success(jsonObject);
- }
-
- /**
- * 根据字典Id集合，获取查询后的字典数据。
- *
- * @param dictIds 字典Id集合。
- * @return 应答结果对象，包含字典形式的数据集合。
- */
- @PostMapping("/listDictByIds")
- public ResponseResult>> listDictByIds(
- @MyRequestBody(elementType = Integer.class) List dictIds) {
- List resultList = gradeService.getInList(new HashSet<>(dictIds));
- return ResponseResult.success(BeanQuery.select(
- "gradeId as id", "gradeName as name").executeFrom(resultList));
- }
-
- /**
- * 将当前字典表的数据重新加载到缓存中。
- * 由于缓存的数据更新，在add/update/delete等接口均有同步处理。因此该接口仅当同步过程中出现问题时，
- * 可手工调用，或者每天晚上定时同步一次。
- */
- @OperationLog(type = SysOperationLogType.RELOAD_CACHE)
- @GetMapping("/reloadCachedData")
- public ResponseResult reloadCachedData() {
- gradeService.reloadCachedData(true);
- return ResponseResult.success(true);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index ff41fb71..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionStatsController.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import com.github.pagehelper.page.PageMethod;
-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.*;
-
-import java.util.*;
-
-/**
- * 学生行为统计操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "学生行为统计管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/studentActionStats")
-public class StudentActionStatsController {
-
- @Autowired
- private StudentActionStatsService studentActionStatsService;
-
- /**
- * 列出符合过滤条件的学生行为统计列表。
- *
- * @param studentActionStatsDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody StudentActionStatsDto studentActionStatsDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- StudentActionStats studentActionStatsFilter = MyModelUtil.copyTo(studentActionStatsDtoFilter, StudentActionStats.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, StudentActionStats.class);
- List studentActionStatsList =
- studentActionStatsService.getStudentActionStatsListWithRelation(studentActionStatsFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentActionStatsList, StudentActionStats.INSTANCE));
- }
-
- /**
- * 分组列出符合过滤条件的学生行为统计列表。
- *
- * @param studentActionStatsDtoFilter 过滤对象。
- * @param groupParam 分组参数。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/listWithGroup")
- public ResponseResult> listWithGroup(
- @MyRequestBody StudentActionStatsDto studentActionStatsDtoFilter,
- @MyRequestBody(required = true) MyGroupParam groupParam,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- String orderBy = MyOrderParam.buildOrderBy(orderParam, StudentActionStats.class);
- groupParam = MyGroupParam.buildGroupBy(groupParam, StudentActionStats.class);
- if (groupParam == null) {
- return ResponseResult.error(
- ErrorCodeEnum.INVALID_ARGUMENT_FORMAT, "数据参数错误，分组参数不能为空！");
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- StudentActionStats filter = MyModelUtil.copyTo(studentActionStatsDtoFilter, StudentActionStats.class);
- MyGroupCriteria criteria = groupParam.getGroupCriteria();
- List resultList = studentActionStatsService.getGroupedStudentActionStatsListWithRelation(
- filter, criteria.getGroupSelect(), criteria.getGroupBy(), orderBy);
- // 分页连同对象数据转换copy工作，下面的方法一并完成。
- return ResponseResult.success(MyPageUtil.makeResponseData(resultList, StudentActionStats.INSTANCE));
- }
-
- /**
- * 查看指定学生行为统计对象详情。
- *
- * @param statsId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long statsId) {
- if (MyCommonUtil.existBlankArgument(statsId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- StudentActionStats studentActionStats = studentActionStatsService.getByIdWithRelation(statsId, MyRelationParam.full());
- if (studentActionStats == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- StudentActionStatsVo studentActionStatsVo = StudentActionStats.INSTANCE.fromModel(studentActionStats);
- return ResponseResult.success(studentActionStatsVo);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 4e9aafdc..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentActionTransController.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import com.orangeforms.common.log.annotation.OperationLog;
-import com.orangeforms.common.log.model.constant.SysOperationLogType;
-import com.github.pagehelper.page.PageMethod;
-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.*;
-
-import java.util.*;
-
-/**
- * 学生行为流水操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "学生行为流水管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/studentActionTrans")
-public class StudentActionTransController {
-
- @Autowired
- private StudentActionTransService studentActionTransService;
-
- /**
- * 新增学生行为流水数据。
- *
- * @param studentActionTransDto 新增对象。
- * @return 应答结果对象，包含新增对象主键Id。
- */
- @ApiOperationSupport(ignoreParameters = {
- "studentActionTransDto.transId",
- "studentActionTransDto.createTimeStart",
- "studentActionTransDto.createTimeEnd"})
- @OperationLog(type = SysOperationLogType.ADD)
- @PostMapping("/add")
- public ResponseResult add(@MyRequestBody StudentActionTransDto studentActionTransDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentActionTransDto, false);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- StudentActionTrans studentActionTrans = MyModelUtil.copyTo(studentActionTransDto, StudentActionTrans.class);
- // 验证关联Id的数据合法性
- CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, null);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- studentActionTrans = studentActionTransService.saveNew(studentActionTrans);
- return ResponseResult.success(studentActionTrans.getTransId());
- }
-
- /**
- * 更新学生行为流水数据。
- *
- * @param studentActionTransDto 更新对象。
- * @return 应答结果对象。
- */
- @ApiOperationSupport(ignoreParameters = {
- "studentActionTransDto.createTimeStart",
- "studentActionTransDto.createTimeEnd"})
- @OperationLog(type = SysOperationLogType.UPDATE)
- @PostMapping("/update")
- public ResponseResult update(@MyRequestBody StudentActionTransDto studentActionTransDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentActionTransDto, true);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- StudentActionTrans studentActionTrans = MyModelUtil.copyTo(studentActionTransDto, StudentActionTrans.class);
- StudentActionTrans originalStudentActionTrans = studentActionTransService.getById(studentActionTrans.getTransId());
- if (originalStudentActionTrans == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- // 验证关联Id的数据合法性
- CallResult callResult = studentActionTransService.verifyRelatedData(studentActionTrans, originalStudentActionTrans);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- if (!studentActionTransService.update(studentActionTrans, originalStudentActionTrans)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 删除学生行为流水数据。
- *
- * @param transId 删除对象主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE)
- @PostMapping("/delete")
- public ResponseResult delete(@MyRequestBody Long transId) {
- String errorMessage;
- if (MyCommonUtil.existBlankArgument(transId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- return this.doDelete(transId);
- }
-
- /**
- * 列出符合过滤条件的学生行为流水列表。
- *
- * @param studentActionTransDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody StudentActionTransDto studentActionTransDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- StudentActionTrans studentActionTransFilter = MyModelUtil.copyTo(studentActionTransDtoFilter, StudentActionTrans.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, StudentActionTrans.class);
- List studentActionTransList =
- studentActionTransService.getStudentActionTransListWithRelation(studentActionTransFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentActionTransList, StudentActionTrans.INSTANCE));
- }
-
- /**
- * 查看指定学生行为流水对象详情。
- *
- * @param transId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long transId) {
- if (MyCommonUtil.existBlankArgument(transId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- StudentActionTrans studentActionTrans = studentActionTransService.getByIdWithRelation(transId, MyRelationParam.full());
- if (studentActionTrans == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- StudentActionTransVo studentActionTransVo = StudentActionTrans.INSTANCE.fromModel(studentActionTrans);
- return ResponseResult.success(studentActionTransVo);
- }
-
- private ResponseResult doDelete(Long transId) {
- String errorMessage;
- // 验证关联Id的数据合法性
- StudentActionTrans originalStudentActionTrans = studentActionTransService.getById(transId);
- if (originalStudentActionTrans == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- if (!studentActionTransService.remove(transId)) {
- errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- return ResponseResult.success();
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 981aa75c..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentClassController.java
+++ /dev/null
@@ -1,426 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import com.orangeforms.common.log.annotation.OperationLog;
-import com.orangeforms.common.log.model.constant.SysOperationLogType;
-import com.github.pagehelper.page.PageMethod;
-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.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 班级数据操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "班级数据管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/studentClass")
-public class StudentClassController {
-
- @Autowired
- private StudentClassService studentClassService;
- @Autowired
- private CourseService courseService;
- @Autowired
- private StudentService studentService;
-
- /**
- * 新增班级数据数据。
- *
- * @param studentClassDto 新增对象。
- * @return 应答结果对象，包含新增对象主键Id。
- */
- @ApiOperationSupport(ignoreParameters = {"studentClassDto.classId"})
- @OperationLog(type = SysOperationLogType.ADD)
- @PostMapping("/add")
- public ResponseResult add(@MyRequestBody StudentClassDto studentClassDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto, false);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- StudentClass studentClass = MyModelUtil.copyTo(studentClassDto, StudentClass.class);
- // 验证关联Id的数据合法性
- CallResult callResult = studentClassService.verifyRelatedData(studentClass, null);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- studentClass = studentClassService.saveNew(studentClass);
- return ResponseResult.success(studentClass.getClassId());
- }
-
- /**
- * 更新班级数据数据。
- *
- * @param studentClassDto 更新对象。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.UPDATE)
- @PostMapping("/update")
- public ResponseResult update(@MyRequestBody StudentClassDto studentClassDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto, true);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- StudentClass studentClass = MyModelUtil.copyTo(studentClassDto, StudentClass.class);
- StudentClass originalStudentClass = studentClassService.getById(studentClass.getClassId());
- if (originalStudentClass == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- // 验证关联Id的数据合法性
- CallResult callResult = studentClassService.verifyRelatedData(studentClass, originalStudentClass);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- if (!studentClassService.update(studentClass, originalStudentClass)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 删除班级数据数据。
- *
- * @param classId 删除对象主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE)
- @PostMapping("/delete")
- public ResponseResult delete(@MyRequestBody Long classId) {
- String errorMessage;
- if (MyCommonUtil.existBlankArgument(classId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- return this.doDelete(classId);
- }
-
- /**
- * 列出符合过滤条件的班级数据列表。
- *
- * @param studentClassDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody StudentClassDto studentClassDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- StudentClass studentClassFilter = MyModelUtil.copyTo(studentClassDtoFilter, StudentClass.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, StudentClass.class);
- List studentClassList =
- studentClassService.getStudentClassListWithRelation(studentClassFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentClassList, StudentClass.INSTANCE));
- }
-
- /**
- * 查看指定班级数据对象详情。
- *
- * @param classId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long classId) {
- if (MyCommonUtil.existBlankArgument(classId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- StudentClass studentClass = studentClassService.getByIdWithRelation(classId, MyRelationParam.full());
- if (studentClass == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- StudentClassVo studentClassVo = StudentClass.INSTANCE.fromModel(studentClass);
- return ResponseResult.success(studentClassVo);
- }
-
- /**
- * 列出不与指定班级数据存在多对多关系的 [课程数据] 列表数据。通常用于查看添加新 [课程数据] 对象的候选列表。
- *
- * @param classId 主表关联字段。
- * @param courseDtoFilter [课程数据] 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，返回符合条件的数据列表。
- */
- @PostMapping("/listNotInClassCourse")
- public ResponseResult> listNotInClassCourse(
- @MyRequestBody Long classId,
- @MyRequestBody CourseDto courseDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (MyCommonUtil.isNotBlankOrNull(classId) && !studentClassService.existId(classId)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Course filter = MyModelUtil.copyTo(courseDtoFilter, Course.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Course.class);
- List courseList =
- courseService.getNotInCourseListByClassId(classId, filter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE));
- }
-
- /**
- * 列出与指定班级数据存在多对多关系的 [课程数据] 列表数据。
- *
- * @param classId 主表关联字段。
- * @param courseDtoFilter [课程数据] 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，返回符合条件的数据列表。
- */
- @PostMapping("/listClassCourse")
- public ResponseResult> listClassCourse(
- @MyRequestBody(required = true) Long classId,
- @MyRequestBody CourseDto courseDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (!studentClassService.existId(classId)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Course filter = MyModelUtil.copyTo(courseDtoFilter, Course.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Course.class);
- List courseList =
- courseService.getCourseListByClassId(classId, filter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE));
- }
-
- /**
- * 批量添加班级数据和 [课程数据] 对象的多对多关联关系数据。
- *
- * @param classId 主表主键Id。
- * @param classCourseDtoList 关联对象列表。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.ADD_M2M)
- @PostMapping("/addClassCourse")
- public ResponseResult addClassCourse(
- @MyRequestBody Long classId,
- @MyRequestBody(elementType = ClassCourseDto.class) List classCourseDtoList) {
- if (MyCommonUtil.existBlankArgument(classId, classCourseDtoList)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- String errorMessage = MyCommonUtil.getModelValidationError(classCourseDtoList);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Set courseIdSet =
- classCourseDtoList.stream().map(ClassCourseDto::getCourseId).collect(Collectors.toSet());
- if (!studentClassService.existId(classId)
- || !courseService.existUniqueKeyList("courseId", courseIdSet)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- List classCourseList =
- MyModelUtil.copyCollectionTo(classCourseDtoList, ClassCourse.class);
- studentClassService.addClassCourseList(classCourseList, classId);
- return ResponseResult.success();
- }
-
- /**
- * 更新指定班级数据和指定 [课程数据] 的多对多关联数据。
- *
- * @param classCourseDto 对多对中间表对象。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.UPDATE)
- @PostMapping("/updateClassCourse")
- public ResponseResult updateClassCourse(
- @MyRequestBody ClassCourseDto classCourseDto) {
- String errorMessage = MyCommonUtil.getModelValidationError(classCourseDto);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- ClassCourse classCourse = MyModelUtil.copyTo(classCourseDto, ClassCourse.class);
- if (!studentClassService.updateClassCourse(classCourse)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 显示班级数据和指定 [课程数据] 的多对多关联详情数据。
- *
- * @param classId 主表主键Id。
- * @param courseId 从表主键Id。
- * @return 应答结果对象，包括中间表详情。
- */
- @GetMapping("/viewClassCourse")
- public ResponseResult viewClassCourse(
- @RequestParam Long classId, @RequestParam Long courseId) {
- if (MyCommonUtil.existBlankArgument(classId, courseId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- ClassCourse classCourse = studentClassService.getClassCourse(classId, courseId);
- if (classCourse == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- ClassCourseVo classCourseVo = MyModelUtil.copyTo(classCourse, ClassCourseVo.class);
- return ResponseResult.success(classCourseVo);
- }
-
- /**
- * 移除指定班级数据和指定 [课程数据] 的多对多关联关系。
- *
- * @param classId 主表主键Id。
- * @param courseId 从表主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE_M2M)
- @PostMapping("/deleteClassCourse")
- public ResponseResult deleteClassCourse(
- @MyRequestBody Long classId, @MyRequestBody Long courseId) {
- if (MyCommonUtil.existBlankArgument(classId, courseId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- if (!studentClassService.removeClassCourse(classId, courseId)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 列出不与指定班级数据存在多对多关系的 [学生数据] 列表数据。通常用于查看添加新 [学生数据] 对象的候选列表。
- *
- * @param classId 主表关联字段。
- * @param studentDtoFilter [学生数据] 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，返回符合条件的数据列表。
- */
- @PostMapping("/listNotInClassStudent")
- public ResponseResult> listNotInClassStudent(
- @MyRequestBody Long classId,
- @MyRequestBody StudentDto studentDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (MyCommonUtil.isNotBlankOrNull(classId) && !studentClassService.existId(classId)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Student filter = MyModelUtil.copyTo(studentDtoFilter, Student.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Student.class);
- List studentList =
- studentService.getNotInStudentListByClassId(classId, filter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentList, Student.INSTANCE));
- }
-
- /**
- * 列出与指定班级数据存在多对多关系的 [学生数据] 列表数据。
- *
- * @param classId 主表关联字段。
- * @param studentDtoFilter [学生数据] 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，返回符合条件的数据列表。
- */
- @PostMapping("/listClassStudent")
- public ResponseResult> listClassStudent(
- @MyRequestBody(required = true) Long classId,
- @MyRequestBody StudentDto studentDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (!studentClassService.existId(classId)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Student filter = MyModelUtil.copyTo(studentDtoFilter, Student.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Student.class);
- List studentList =
- studentService.getStudentListByClassId(classId, filter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentList, Student.INSTANCE));
- }
-
- /**
- * 批量添加班级数据和 [学生数据] 对象的多对多关联关系数据。
- *
- * @param classId 主表主键Id。
- * @param classStudentDtoList 关联对象列表。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.ADD_M2M)
- @PostMapping("/addClassStudent")
- public ResponseResult addClassStudent(
- @MyRequestBody Long classId,
- @MyRequestBody(elementType = ClassStudentDto.class) List classStudentDtoList) {
- if (MyCommonUtil.existBlankArgument(classId, classStudentDtoList)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- String errorMessage = MyCommonUtil.getModelValidationError(classStudentDtoList);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Set studentIdSet =
- classStudentDtoList.stream().map(ClassStudentDto::getStudentId).collect(Collectors.toSet());
- if (!studentClassService.existId(classId)
- || !studentService.existUniqueKeyList("studentId", studentIdSet)) {
- return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
- }
- List classStudentList =
- MyModelUtil.copyCollectionTo(classStudentDtoList, ClassStudent.class);
- studentClassService.addClassStudentList(classStudentList, classId);
- return ResponseResult.success();
- }
-
- /**
- * 移除指定班级数据和指定 [学生数据] 的多对多关联关系。
- *
- * @param classId 主表主键Id。
- * @param studentId 从表主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE_M2M)
- @PostMapping("/deleteClassStudent")
- public ResponseResult deleteClassStudent(
- @MyRequestBody Long classId, @MyRequestBody Long studentId) {
- if (MyCommonUtil.existBlankArgument(classId, studentId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- if (!studentClassService.removeClassStudent(classId, studentId)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- private ResponseResult doDelete(Long classId) {
- String errorMessage;
- // 验证关联Id的数据合法性
- StudentClass originalStudentClass = studentClassService.getById(classId);
- if (originalStudentClass == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- if (!studentClassService.remove(classId)) {
- errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- return ResponseResult.success();
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 225c44bf..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/StudentController.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.orangeforms.webadmin.app.controller;
-
-import cn.jimmyshi.beanquery.BeanQuery;
-import com.orangeforms.common.log.annotation.OperationLog;
-import com.orangeforms.common.log.model.constant.SysOperationLogType;
-import com.github.pagehelper.page.PageMethod;
-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.*;
-
-import java.util.*;
-
-/**
- * 学生数据操作控制器类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Api(tags = "学生数据管理接口")
-@Slf4j
-@RestController
-@RequestMapping("/admin/app/student")
-public class StudentController {
-
- @Autowired
- private StudentService studentService;
-
- /**
- * 新增学生数据数据。
- *
- * @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) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentDto, false);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Student student = MyModelUtil.copyTo(studentDto, Student.class);
- // 验证关联Id的数据合法性
- CallResult callResult = studentService.verifyRelatedData(student, null);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- student = studentService.saveNew(student);
- return ResponseResult.success(student.getStudentId());
- }
-
- /**
- * 更新学生数据数据。
- *
- * @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) {
- String errorMessage = MyCommonUtil.getModelValidationError(studentDto, true);
- if (errorMessage != null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
- }
- Student student = MyModelUtil.copyTo(studentDto, Student.class);
- Student originalStudent = studentService.getById(student.getStudentId());
- if (originalStudent == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- // 验证关联Id的数据合法性
- CallResult callResult = studentService.verifyRelatedData(student, originalStudent);
- if (!callResult.isSuccess()) {
- return ResponseResult.errorFrom(callResult);
- }
- if (!studentService.update(student, originalStudent)) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- return ResponseResult.success();
- }
-
- /**
- * 删除学生数据数据。
- *
- * @param studentId 删除对象主键Id。
- * @return 应答结果对象。
- */
- @OperationLog(type = SysOperationLogType.DELETE)
- @PostMapping("/delete")
- public ResponseResult delete(@MyRequestBody Long studentId) {
- String errorMessage;
- if (MyCommonUtil.existBlankArgument(studentId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- return this.doDelete(studentId);
- }
-
- /**
- * 列出符合过滤条件的学生数据列表。
- *
- * @param studentDtoFilter 过滤对象。
- * @param orderParam 排序参数。
- * @param pageParam 分页参数。
- * @return 应答结果对象，包含查询结果集。
- */
- @PostMapping("/list")
- public ResponseResult> list(
- @MyRequestBody StudentDto studentDtoFilter,
- @MyRequestBody MyOrderParam orderParam,
- @MyRequestBody MyPageParam pageParam) {
- if (pageParam != null) {
- PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
- }
- Student studentFilter = MyModelUtil.copyTo(studentDtoFilter, Student.class);
- String orderBy = MyOrderParam.buildOrderBy(orderParam, Student.class);
- List studentList = studentService.getStudentListWithRelation(studentFilter, orderBy);
- return ResponseResult.success(MyPageUtil.makeResponseData(studentList, Student.INSTANCE));
- }
-
- /**
- * 查看指定学生数据对象详情。
- *
- * @param studentId 指定对象主键Id。
- * @return 应答结果对象，包含对象详情。
- */
- @GetMapping("/view")
- public ResponseResult view(@RequestParam Long studentId) {
- if (MyCommonUtil.existBlankArgument(studentId)) {
- return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
- }
- Student student = studentService.getByIdWithRelation(studentId, MyRelationParam.full());
- if (student == null) {
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
- }
- StudentVo studentVo = Student.INSTANCE.fromModel(student);
- return ResponseResult.success(studentVo);
- }
-
- /**
- * 以字典形式返回全部学生数据数据集合。字典的键值为[studentId, studentName]。
- * 白名单接口，登录用户均可访问。
- *
- * @param filter 过滤对象。
- * @return 应答结果对象，包含的数据为 List>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
- */
- @GetMapping("/listDict")
- public ResponseResult>> listDict(Student filter) {
- List resultList = studentService.getListByFilter(filter);
- return ResponseResult.success(BeanQuery.select(
- "studentId as id", "studentName as name").executeFrom(resultList));
- }
-
- /**
- * 根据字典Id集合，获取查询后的字典数据。
- *
- * @param dictIds 字典Id集合。
- * @return 应答结果对象，包含字典形式的数据集合。
- */
- @PostMapping("/listDictByIds")
- public ResponseResult>> listDictByIds(
- @MyRequestBody(elementType = Long.class) List dictIds) {
- List resultList = studentService.getInList(new HashSet<>(dictIds));
- return ResponseResult.success(BeanQuery.select(
- "studentId as id", "studentName as name").executeFrom(resultList));
- }
-
- private ResponseResult doDelete(Long studentId) {
- String errorMessage;
- // 验证关联Id的数据合法性
- Student originalStudent = studentService.getById(studentId);
- if (originalStudent == null) {
- // NOTE: 修改下面方括号中的话述
- errorMessage = "数据验证失败，当前 [对象] 并不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- if (!studentService.remove(studentId)) {
- errorMessage = "数据操作失败，删除的对象不存在，请刷新后重试！";
- return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
- }
- return ResponseResult.success();
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index fbf9293f..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.AreaCode;
-
-/**
- * 行政区划数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface AreaCodeMapper extends BaseDaoMapper {
-}
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 69ebef35..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassCourseMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.ClassCourse;
-
-import java.util.*;
-
-/**
- * 数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface ClassCourseMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param classCourseList 新增对象列表。
- */
- void insertList(List classCourseList);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 169b64b2..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/ClassStudentMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.ClassStudent;
-
-import java.util.*;
-
-/**
- * 数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface ClassStudentMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param classStudentList 新增对象列表。
- */
- void insertList(List classStudentList);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 824702e8..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.Course;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 课程数据数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface CourseMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param courseList 新增对象列表。
- */
- void insertList(List courseList);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param courseFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getCourseList(
- @Param("courseFilter") Course courseFilter, @Param("orderBy") String orderBy);
-
- /**
- * 根据关联主表Id，获取关联从表数据列表。
- *
- * @param classId 关联主表Id。
- * @param courseFilter 从表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 从表数据列表。
- */
- List getCourseListByClassId(
- @Param("classId") Long classId,
- @Param("courseFilter") Course courseFilter,
- @Param("orderBy") String orderBy);
-
- /**
- * 根据关联主表Id，获取关联从表中没有和主表建立关联关系的数据列表。
- *
- * @param classId 关联主表Id。
- * @param courseFilter 过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 与主表没有建立关联的从表数据列表。
- */
- List getNotInCourseListByClassId(
- @Param("classId") Long classId,
- @Param("courseFilter") Course courseFilter,
- @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 6a61252f..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/CourseTransStatsMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.CourseTransStats;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 课程统计数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface CourseTransStatsMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param courseTransStatsList 新增对象列表。
- */
- void insertList(List courseTransStatsList);
-
- /**
- * 获取分组计算后的数据对象列表。
- *
- * @param courseTransStatsFilter 主表过滤对象。
- * @param groupSelect 分组显示字段列表字符串，SELECT从句的参数。
- * @param groupBy 分组字段列表字符串，GROUP BY从句的参数。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 对象列表。
- */
- List getGroupedCourseTransStatsList(
- @Param("courseTransStatsFilter") CourseTransStats courseTransStatsFilter,
- @Param("groupSelect") String groupSelect,
- @Param("groupBy") String groupBy,
- @Param("orderBy") String orderBy);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param courseTransStatsFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getCourseTransStatsList(
- @Param("courseTransStatsFilter") CourseTransStats courseTransStatsFilter, @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index b296b969..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/GradeMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.Grade;
-
-import java.util.*;
-
-/**
- * 年级数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface GradeMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param gradeList 新增对象列表。
- */
- void insertList(List gradeList);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 24f4e1f3..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/MaterialEditionMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.MaterialEdition;
-
-import java.util.*;
-
-/**
- * 数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface MaterialEditionMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param materialEditionList 新增对象列表。
- */
- void insertList(List materialEditionList);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index e284204c..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionStatsMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.StudentActionStats;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 学生行为统计数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentActionStatsMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param studentActionStatsList 新增对象列表。
- */
- void insertList(List studentActionStatsList);
-
- /**
- * 获取分组计算后的数据对象列表。
- *
- * @param studentActionStatsFilter 主表过滤对象。
- * @param groupSelect 分组显示字段列表字符串，SELECT从句的参数。
- * @param groupBy 分组字段列表字符串，GROUP BY从句的参数。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 对象列表。
- */
- List getGroupedStudentActionStatsList(
- @Param("studentActionStatsFilter") StudentActionStats studentActionStatsFilter,
- @Param("groupSelect") String groupSelect,
- @Param("groupBy") String groupBy,
- @Param("orderBy") String orderBy);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param studentActionStatsFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getStudentActionStatsList(
- @Param("studentActionStatsFilter") StudentActionStats studentActionStatsFilter, @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index b556fc41..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentActionTransMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.StudentActionTrans;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 学生行为流水数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentActionTransMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param studentActionTransList 新增对象列表。
- */
- void insertList(List studentActionTransList);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param studentActionTransFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getStudentActionTransList(
- @Param("studentActionTransFilter") StudentActionTrans studentActionTransFilter, @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 2bdb53b5..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentClassMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.StudentClass;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 班级数据数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentClassMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param studentClassList 新增对象列表。
- */
- void insertList(List studentClassList);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param studentClassFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getStudentClassList(
- @Param("studentClassFilter") StudentClass studentClassFilter, @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 22fd6c53..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/StudentMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.orangeforms.webadmin.app.dao;
-
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.webadmin.app.model.Student;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.*;
-
-/**
- * 学生数据数据操作访问接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentMapper extends BaseDaoMapper {
-
- /**
- * 批量插入对象列表。
- *
- * @param studentList 新增对象列表。
- */
- void insertList(List studentList);
-
- /**
- * 获取过滤后的对象列表。
- *
- * @param studentFilter 主表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 对象列表。
- */
- List getStudentList(
- @Param("studentFilter") Student studentFilter, @Param("orderBy") String orderBy);
-
- /**
- * 根据关联主表Id，获取关联从表数据列表。
- *
- * @param classId 关联主表Id。
- * @param studentFilter 从表过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 从表数据列表。
- */
- List getStudentListByClassId(
- @Param("classId") Long classId,
- @Param("studentFilter") Student studentFilter,
- @Param("orderBy") String orderBy);
-
- /**
- * 根据关联主表Id，获取关联从表中没有和主表建立关联关系的数据列表。
- *
- * @param classId 关联主表Id。
- * @param studentFilter 过滤对象。
- * @param orderBy 排序字符串，order by从句的参数。
- * @return 与主表没有建立关联的从表数据列表。
- */
- List getNotInStudentListByClassId(
- @Param("classId") Long classId,
- @Param("studentFilter") Student studentFilter,
- @Param("orderBy") String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 09e629fa..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index d4f87e62..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassCourseMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_class_course
- (class_id,
- course_id,
- course_order)
- VALUES
-
- (#{item.classId},
- #{item.courseId},
- #{item.courseOrder})
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index d854784e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/ClassStudentMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_class_student
- (class_id,
- student_id)
- VALUES
-
- (#{item.classId},
- #{item.studentId})
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/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
deleted file mode 100644
index 60c3a7ba..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseMapper.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_course
- (course_id,
- course_name,
- price,
- description,
- difficulty,
- grade_id,
- subject_id,
- class_hour,
- picture_url,
- create_user_id,
- create_time,
- update_time)
- VALUES
-
- (#{item.courseId},
- #{item.courseName},
- #{item.price},
- #{item.description},
- #{item.difficulty},
- #{item.gradeId},
- #{item.subjectId},
- #{item.classHour},
- #{item.pictureUrl},
- #{item.createUserId},
- #{item.createTime},
- #{item.updateTime})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND zz_course.course_name LIKE #{safeCourseCourseName}
-
-
- AND zz_course.price >= #{courseFilter.priceStart}
-
-
- AND zz_course.price <= #{courseFilter.priceEnd}
-
-
- AND zz_course.difficulty = #{courseFilter.difficulty}
-
-
- AND zz_course.grade_id = #{courseFilter.gradeId}
-
-
- AND zz_course.subject_id = #{courseFilter.subjectId}
-
-
- AND zz_course.class_hour >= #{courseFilter.classHourStart}
-
-
- AND zz_course.class_hour <= #{courseFilter.classHourEnd}
-
-
- AND zz_course.create_time >= #{courseFilter.createTimeStart}
-
-
- AND zz_course.create_time <= #{courseFilter.createTimeEnd}
-
-
-
-
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml
deleted file mode 100644
index f486d6e5..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/CourseTransStatsMapper.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_course_trans_stats
- (stats_id,
- stats_date,
- subject_id,
- grade_id,
- grade_name,
- course_id,
- course_name,
- student_attend_count,
- student_flower_amount,
- student_flower_count)
- VALUES
-
- (#{item.statsId},
- #{item.statsDate},
- #{item.subjectId},
- #{item.gradeId},
- #{item.gradeName},
- #{item.courseId},
- #{item.courseName},
- #{item.studentAttendCount},
- #{item.studentFlowerAmount},
- #{item.studentFlowerCount})
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND zz_course_trans_stats.stats_date >= #{courseTransStatsFilter.statsDateStart}
-
-
- AND zz_course_trans_stats.stats_date <= #{courseTransStatsFilter.statsDateEnd}
-
-
- AND zz_course_trans_stats.subject_id = #{courseTransStatsFilter.subjectId}
-
-
- AND zz_course_trans_stats.grade_id = #{courseTransStatsFilter.gradeId}
-
-
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml
deleted file mode 100644
index 00a1865b..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/GradeMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_grade
- (grade_id,
- grade_name,
- status)
- VALUES
-
- (#{item.gradeId},
- #{item.gradeName},
- #{item.status})
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml
deleted file mode 100644
index f8679079..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/MaterialEditionMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_material_edition
- (edition_id,
- edition_name,
- status)
- VALUES
-
- (#{item.editionId},
- #{item.editionName},
- #{item.status})
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml
deleted file mode 100644
index fa08640e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionStatsMapper.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_student_action_stats
- (stats_id,
- stats_date,
- stats_month,
- grade_id,
- province_id,
- city_id,
- buy_course_amount,
- buy_course_count,
- buy_video_amount,
- buy_video_count,
- buy_paper_amount,
- buy_paper_count,
- buy_flower_amount,
- buy_flower_count,
- recharge_coin_amount,
- recharge_coin_count,
- do_course_count,
- watch_video_count,
- watch_video_total_second,
- do_exercise_count,
- do_exercise_correct_count)
- VALUES
-
- (#{item.statsId},
- #{item.statsDate},
- #{item.statsMonth},
- #{item.gradeId},
- #{item.provinceId},
- #{item.cityId},
- #{item.buyCourseAmount},
- #{item.buyCourseCount},
- #{item.buyVideoAmount},
- #{item.buyVideoCount},
- #{item.buyPaperAmount},
- #{item.buyPaperCount},
- #{item.buyFlowerAmount},
- #{item.buyFlowerCount},
- #{item.rechargeCoinAmount},
- #{item.rechargeCoinCount},
- #{item.doCourseCount},
- #{item.watchVideoCount},
- #{item.watchVideoTotalSecond},
- #{item.doExerciseCount},
- #{item.doExerciseCorrectCount})
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND zz_student_action_stats.stats_date >= #{studentActionStatsFilter.statsDateStart}
-
-
- AND zz_student_action_stats.stats_date <= #{studentActionStatsFilter.statsDateEnd}
-
-
- AND zz_student_action_stats.grade_id = #{studentActionStatsFilter.gradeId}
-
-
- AND zz_student_action_stats.province_id = #{studentActionStatsFilter.provinceId}
-
-
- AND zz_student_action_stats.city_id = #{studentActionStatsFilter.cityId}
-
-
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml
deleted file mode 100644
index c5c8b4cb..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentActionTransMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_student_action_trans
- (trans_id,
- student_id,
- student_name,
- school_id,
- grade_id,
- action_type,
- device_type,
- watch_video_seconds,
- flower_count,
- paper_count,
- video_count,
- course_count,
- coin_count,
- exercise_correct_flag,
- create_time)
- VALUES
-
- (#{item.transId},
- #{item.studentId},
- #{item.studentName},
- #{item.schoolId},
- #{item.gradeId},
- #{item.actionType},
- #{item.deviceType},
- #{item.watchVideoSeconds},
- #{item.flowerCount},
- #{item.paperCount},
- #{item.videoCount},
- #{item.courseCount},
- #{item.coinCount},
- #{item.exerciseCorrectFlag},
- #{item.createTime})
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND zz_student_action_trans.student_id = #{studentActionTransFilter.studentId}
-
-
- AND zz_student_action_trans.school_id = #{studentActionTransFilter.schoolId}
-
-
- AND zz_student_action_trans.grade_id = #{studentActionTransFilter.gradeId}
-
-
- AND zz_student_action_trans.action_type = #{studentActionTransFilter.actionType}
-
-
- AND zz_student_action_trans.device_type = #{studentActionTransFilter.deviceType}
-
-
- AND zz_student_action_trans.create_time >= #{studentActionTransFilter.createTimeStart}
-
-
- AND zz_student_action_trans.create_time <= #{studentActionTransFilter.createTimeEnd}
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml
deleted file mode 100644
index e86de237..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentClassMapper.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_class
- (class_id,
- class_name,
- school_id,
- leader_id,
- finish_class_hour,
- class_level,
- create_user_id,
- create_time,
- status)
- VALUES
-
- (#{item.classId},
- #{item.className},
- #{item.schoolId},
- #{item.leaderId},
- #{item.finishClassHour},
- #{item.classLevel},
- #{item.createUserId},
- #{item.createTime},
- #{item.status})
-
-
-
-
-
-
-
- AND zz_class.status = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
-
-
-
-
-
-
- AND zz_class.class_name = #{studentClassFilter.className}
-
-
- AND zz_class.school_id = #{studentClassFilter.schoolId}
-
-
- AND zz_class.class_level = #{studentClassFilter.classLevel}
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml
deleted file mode 100644
index 2096a6b8..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/StudentMapper.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO zz_student
- (student_id,
- login_mobile,
- student_name,
- province_id,
- city_id,
- district_id,
- gender,
- birthday,
- experience_level,
- total_coin,
- left_coin,
- grade_id,
- school_id,
- register_time,
- status)
- VALUES
-
- (#{item.studentId},
- #{item.loginMobile},
- #{item.studentName},
- #{item.provinceId},
- #{item.cityId},
- #{item.districtId},
- #{item.gender},
- #{item.birthday},
- #{item.experienceLevel},
- #{item.totalCoin},
- #{item.leftCoin},
- #{item.gradeId},
- #{item.schoolId},
- #{item.registerTime},
- #{item.status})
-
-
-
-
-
-
-
-
-
-
-
-
-
- AND zz_student.province_id = #{studentFilter.provinceId}
-
-
- AND zz_student.city_id = #{studentFilter.cityId}
-
-
- AND zz_student.district_id = #{studentFilter.districtId}
-
-
- AND zz_student.birthday >= #{studentFilter.birthdayStart}
-
-
- AND zz_student.birthday <= #{studentFilter.birthdayEnd}
-
-
- AND zz_student.grade_id = #{studentFilter.gradeId}
-
-
- AND zz_student.school_id = #{studentFilter.schoolId}
-
-
- AND zz_student.register_time >= #{studentFilter.registerTimeStart}
-
-
- AND zz_student.register_time <= #{studentFilter.registerTimeEnd}
-
-
- AND zz_student.status = #{studentFilter.status}
-
-
-
- AND CONCAT(IFNULL(zz_student.login_mobile,''), IFNULL(zz_student.student_name,'')) LIKE #{safeStudentSearchString}
-
-
-
-
-
-
-
-
-
-
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java
deleted file mode 100644
index 8a9490c3..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassCourseDto.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-/**
- * ClassCourseDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("ClassCourseDto对象")
-@Data
-public class ClassCourseDto {
-
- /**
- * 班级Id。
- */
- @ApiModelProperty(value = "班级Id", required = true)
- @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
- private Long classId;
-
- /**
- * 课程Id。
- */
- @ApiModelProperty(value = "课程Id", required = true)
- @NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class})
- private Long courseId;
-
- /**
- * 课程顺序(数值越小越靠前)。
- */
- @ApiModelProperty(value = "课程顺序(数值越小越靠前)", required = true)
- @NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！", groups = {UpdateGroup.class})
- private Integer courseOrder;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java
deleted file mode 100644
index 5994c4c3..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/ClassStudentDto.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-/**
- * ClassStudentDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("ClassStudentDto对象")
-@Data
-public class ClassStudentDto {
-
- /**
- * 班级Id。
- */
- @ApiModelProperty(value = "班级Id", required = true)
- @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
- private Long classId;
-
- /**
- * 学生Id。
- */
- @ApiModelProperty(value = "学生Id", required = true)
- @NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
- private Long studentId;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java
deleted file mode 100644
index a3c90883..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseDto.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-import com.orangeforms.common.core.validator.ConstDictRef;
-import com.orangeforms.webadmin.app.model.constant.CourseDifficult;
-import com.orangeforms.application.common.constant.Subject;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * CourseDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("CourseDto对象")
-@Data
-public class CourseDto {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id", required = true)
- @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @ApiModelProperty(value = "课程名称", required = true)
- @NotBlank(message = "数据验证失败，课程名称不能为空！")
- private String courseName;
-
- /**
- * 课程价格。
- */
- @ApiModelProperty(value = "课程价格", required = true)
- @NotNull(message = "数据验证失败，课程价格不能为空！")
- private BigDecimal price;
-
- /**
- * 课程描述。
- */
- @ApiModelProperty(value = "课程描述")
- private String description;
-
- /**
- * 课程难度(0: 容易 1: 普通 2: 很难)。
- */
- @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)", required = true)
- @NotNull(message = "数据验证失败，课程难度不能为空！")
- @ConstDictRef(constDictClass = CourseDifficult.class, message = "数据验证失败，课程难度为无效值！")
- private Integer difficulty;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id", required = true)
- @NotNull(message = "数据验证失败，所属年级不能为空！")
- private Integer gradeId;
-
- /**
- * 学科Id。
- */
- @ApiModelProperty(value = "学科Id", required = true)
- @NotNull(message = "数据验证失败，所属学科不能为空！")
- @ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属学科为无效值！")
- private Integer subjectId;
-
- /**
- * 课时数量。
- */
- @ApiModelProperty(value = "课时数量", required = true)
- @NotNull(message = "数据验证失败，课时数量不能为空！")
- private Integer classHour;
-
- /**
- * 多张课程图片地址。
- */
- @ApiModelProperty(value = "多张课程图片地址", required = true)
- @NotBlank(message = "数据验证失败，课程图片不能为空！")
- private String pictureUrl;
-
- /**
- * 创建用户Id。
- */
- @ApiModelProperty(value = "创建用户Id")
- private Long createUserId;
-
- /**
- * 创建时间。
- */
- @ApiModelProperty(value = "创建时间")
- private Date createTime;
-
- /**
- * 最后修改时间。
- */
- @ApiModelProperty(value = "最后修改时间")
- private Date updateTime;
-
- /**
- * price 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "price 范围过滤起始值(>=)")
- private BigDecimal priceStart;
-
- /**
- * price 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "price 范围过滤结束值(<=)")
- private BigDecimal priceEnd;
-
- /**
- * classHour 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "classHour 范围过滤起始值(>=)")
- private Integer classHourStart;
-
- /**
- * classHour 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "classHour 范围过滤结束值(<=)")
- private Integer classHourEnd;
-
- /**
- * createTime 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
- private String createTimeStart;
-
- /**
- * createTime 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
- private String createTimeEnd;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java
deleted file mode 100644
index 9209baf8..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/CourseTransStatsDto.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-import com.orangeforms.common.core.validator.ConstDictRef;
-import com.orangeforms.application.common.constant.Subject;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-/**
- * CourseTransStatsDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("CourseTransStatsDto对象")
-@Data
-public class CourseTransStatsDto {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id", required = true)
- @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
- private Long statsId;
-
- /**
- * 统计日期。
- */
- @ApiModelProperty(value = "统计日期", required = true)
- @NotNull(message = "数据验证失败，统计日期不能为空！")
- private Date statsDate;
-
- /**
- * 科目Id。
- */
- @ApiModelProperty(value = "科目Id", required = true)
- @NotNull(message = "数据验证失败，所属科目不能为空！")
- @ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属科目为无效值！")
- private Integer subjectId;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id", required = true)
- @NotNull(message = "数据验证失败，所属年级不能为空！")
- private Integer gradeId;
-
- /**
- * 年级名称。
- */
- @ApiModelProperty(value = "年级名称")
- private String gradeName;
-
- /**
- * 课程Id。
- */
- @ApiModelProperty(value = "课程Id", required = true)
- @NotNull(message = "数据验证失败，课程Id不能为空！")
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @ApiModelProperty(value = "课程名称")
- private String courseName;
-
- /**
- * 学生上课次数。
- */
- @ApiModelProperty(value = "学生上课次数", required = true)
- @NotNull(message = "数据验证失败，上课次数不能为空！")
- private Integer studentAttendCount;
-
- /**
- * 学生献花数量。
- */
- @ApiModelProperty(value = "学生献花数量", required = true)
- @NotNull(message = "数据验证失败，献花数量不能为空！")
- private Integer studentFlowerAmount;
-
- /**
- * 学生献花次数。
- */
- @ApiModelProperty(value = "学生献花次数", required = true)
- @NotNull(message = "数据验证失败，献花次数不能为空！")
- private Integer studentFlowerCount;
-
- /**
- * statsDate 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "statsDate 范围过滤起始值(>=)")
- private String statsDateStart;
-
- /**
- * statsDate 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "statsDate 范围过滤结束值(<=)")
- private String statsDateEnd;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java
deleted file mode 100644
index 1dde3d08..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/GradeDto.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-/**
- * GradeDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("GradeDto对象")
-@Data
-public class GradeDto {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id", required = true)
- @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
- private Integer gradeId;
-
- /**
- * 年级名称。
- */
- @ApiModelProperty(value = "年级名称", required = true)
- @NotBlank(message = "数据验证失败，年级名称不能为空！")
- private String gradeName;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java
deleted file mode 100644
index 42a704c7..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionStatsDto.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-/**
- * StudentActionStatsDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("StudentActionStatsDto对象")
-@Data
-public class StudentActionStatsDto {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id", required = true)
- @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
- private Long statsId;
-
- /**
- * 统计日期。
- */
- @ApiModelProperty(value = "统计日期", required = true)
- @NotNull(message = "数据验证失败，统计日期不能为空！")
- private Date statsDate;
-
- /**
- * 统计小时。
- */
- @ApiModelProperty(value = "统计小时")
- private Date statsMonth;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id", required = true)
- @NotNull(message = "数据验证失败，所属年级不能为空！")
- private Integer gradeId;
-
- /**
- * 学生所在省Id。
- */
- @ApiModelProperty(value = "学生所在省Id", required = true)
- @NotNull(message = "数据验证失败，所在省份不能为空！")
- private Long provinceId;
-
- /**
- * 学生所在城市Id。
- */
- @ApiModelProperty(value = "学生所在城市Id", required = true)
- @NotNull(message = "数据验证失败，所在城市不能为空！", groups = {UpdateGroup.class})
- private Long cityId;
-
- /**
- * 购课学币数量。
- */
- @ApiModelProperty(value = "购课学币数量", required = true)
- @NotNull(message = "数据验证失败，购课学币数量不能为空！", groups = {UpdateGroup.class})
- private Integer buyCourseAmount;
-
- /**
- * 购买课程次数。
- */
- @ApiModelProperty(value = "购买课程次数", required = true)
- @NotNull(message = "数据验证失败，购买课程次数不能为空！", groups = {UpdateGroup.class})
- private Integer buyCourseCount;
-
- /**
- * 购买视频学币数量。
- */
- @ApiModelProperty(value = "购买视频学币数量", required = true)
- @NotNull(message = "数据验证失败，购买视频学币数量不能为空！", groups = {UpdateGroup.class})
- private Integer buyVideoAmount;
-
- /**
- * 购买视频次数。
- */
- @ApiModelProperty(value = "购买视频次数", required = true)
- @NotNull(message = "数据验证失败，购买视频次数不能为空！", groups = {UpdateGroup.class})
- private Integer buyVideoCount;
-
- /**
- * 购买作业学币数量。
- */
- @ApiModelProperty(value = "购买作业学币数量", required = true)
- @NotNull(message = "数据验证失败，购买作业学币数量不能为空！", groups = {UpdateGroup.class})
- private Integer buyPaperAmount;
-
- /**
- * 购买作业次数。
- */
- @ApiModelProperty(value = "购买作业次数", required = true)
- @NotNull(message = "数据验证失败，购买作业次数不能为空！", groups = {UpdateGroup.class})
- private Integer buyPaperCount;
-
- /**
- * 购买献花数量。
- */
- @ApiModelProperty(value = "购买献花数量", required = true)
- @NotNull(message = "数据验证失败，购买献花数量不能为空！", groups = {UpdateGroup.class})
- private Integer buyFlowerAmount;
-
- /**
- * 购买献花次数。
- */
- @ApiModelProperty(value = "购买献花次数", required = true)
- @NotNull(message = "数据验证失败，购买献花次数不能为空！", groups = {UpdateGroup.class})
- private Integer buyFlowerCount;
-
- /**
- * 充值学币数量。
- */
- @ApiModelProperty(value = "充值学币数量", required = true)
- @NotNull(message = "数据验证失败，充值学币数量不能为空！", groups = {UpdateGroup.class})
- private Integer rechargeCoinAmount;
-
- /**
- * 充值学币次数。
- */
- @ApiModelProperty(value = "充值学币次数", required = true)
- @NotNull(message = "数据验证失败，充值学币次数不能为空！", groups = {UpdateGroup.class})
- private Integer rechargeCoinCount;
-
- /**
- * 线下课程上课次数。
- */
- @ApiModelProperty(value = "线下课程上课次数", required = true)
- @NotNull(message = "数据验证失败，线下课程上课次数不能为空！")
- private Integer doCourseCount;
-
- /**
- * 观看视频次数。
- */
- @ApiModelProperty(value = "观看视频次数", required = true)
- @NotNull(message = "数据验证失败，观看视频次数不能为空！", groups = {UpdateGroup.class})
- private Integer watchVideoCount;
-
- /**
- * 购买献花消费学币数量。
- */
- @ApiModelProperty(value = "购买献花消费学币数量", required = true)
- @NotNull(message = "数据验证失败，购买献花消费学币数量不能为空！")
- private Integer watchVideoTotalSecond;
-
- /**
- * 做题数量。
- */
- @ApiModelProperty(value = "做题数量", required = true)
- @NotNull(message = "数据验证失败，做题数量不能为空！", groups = {UpdateGroup.class})
- private Integer doExerciseCount;
-
- /**
- * 做题正确的数量。
- */
- @ApiModelProperty(value = "做题正确的数量", required = true)
- @NotNull(message = "数据验证失败，做题正确的数量不能为空！", groups = {UpdateGroup.class})
- private Integer doExerciseCorrectCount;
-
- /**
- * statsDate 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "statsDate 范围过滤起始值(>=)")
- private String statsDateStart;
-
- /**
- * statsDate 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "statsDate 范围过滤结束值(<=)")
- private String statsDateEnd;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java
deleted file mode 100644
index c4bdef93..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentActionTransDto.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-import com.orangeforms.common.core.validator.ConstDictRef;
-import com.orangeforms.application.common.constant.StudentActionType;
-import com.orangeforms.application.common.constant.DeviceType;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-/**
- * StudentActionTransDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("StudentActionTransDto对象")
-@Data
-public class StudentActionTransDto {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id", required = true)
- @NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
- private Long transId;
-
- /**
- * 学生Id。
- */
- @ApiModelProperty(value = "学生Id", required = true)
- @NotNull(message = "数据验证失败，学生Id不能为空！")
- private Long studentId;
-
- /**
- * 学生名称。
- */
- @ApiModelProperty(value = "学生名称", required = true)
- @NotBlank(message = "数据验证失败，学生名称不能为空！")
- private String studentName;
-
- /**
- * 学生校区。
- */
- @ApiModelProperty(value = "学生校区", required = true)
- @NotNull(message = "数据验证失败，学生校区不能为空！")
- private Long schoolId;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id", required = true)
- @NotNull(message = "数据验证失败，学生年级不能为空！")
- private Integer gradeId;
-
- /**
- * 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
- */
- @ApiModelProperty(value = "行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)", required = true)
- @NotNull(message = "数据验证失败，行为类型不能为空！")
- @ConstDictRef(constDictClass = StudentActionType.class, message = "数据验证失败，行为类型为无效值！")
- private Integer actionType;
-
- /**
- * 设备类型(0: iOS 1: Android 2: PC)。
- */
- @ApiModelProperty(value = "设备类型(0: iOS 1: Android 2: PC)", required = true)
- @NotNull(message = "数据验证失败，设备类型不能为空！")
- @ConstDictRef(constDictClass = DeviceType.class, message = "数据验证失败，设备类型为无效值！")
- private Integer deviceType;
-
- /**
- * 看视频秒数。
- */
- @ApiModelProperty(value = "看视频秒数")
- private Integer watchVideoSeconds;
-
- /**
- * 购买献花数量。
- */
- @ApiModelProperty(value = "购买献花数量")
- private Integer flowerCount;
-
- /**
- * 购买作业数量。
- */
- @ApiModelProperty(value = "购买作业数量")
- private Integer paperCount;
-
- /**
- * 购买视频数量。
- */
- @ApiModelProperty(value = "购买视频数量")
- private Integer videoCount;
-
- /**
- * 购买课程数量。
- */
- @ApiModelProperty(value = "购买课程数量")
- private Integer courseCount;
-
- /**
- * 充值学币数量。
- */
- @ApiModelProperty(value = "充值学币数量")
- private Integer coinCount;
-
- /**
- * 做题是否正确标记。
- */
- @ApiModelProperty(value = "做题是否正确标记")
- private Integer exerciseCorrectFlag;
-
- /**
- * 发生时间。
- */
- @ApiModelProperty(value = "发生时间")
- private Date createTime;
-
- /**
- * createTime 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
- private String createTimeStart;
-
- /**
- * createTime 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
- private String createTimeEnd;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java
deleted file mode 100644
index 9ff88f3e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentClassDto.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-import com.orangeforms.common.core.validator.ConstDictRef;
-import com.orangeforms.webadmin.app.model.constant.ClassLevel;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-/**
- * StudentClassDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("StudentClassDto对象")
-@Data
-public class StudentClassDto {
-
- /**
- * 班级Id。
- */
- @ApiModelProperty(value = "班级Id", required = true)
- @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
- private Long classId;
-
- /**
- * 班级名称。
- */
- @ApiModelProperty(value = "班级名称", required = true)
- @NotBlank(message = "数据验证失败，班级名称不能为空！")
- private String className;
-
- /**
- * 学校Id。
- */
- @ApiModelProperty(value = "学校Id", required = true)
- @NotNull(message = "数据验证失败，所属校区不能为空！")
- private Long schoolId;
-
- /**
- * 学生班长Id。
- */
- @ApiModelProperty(value = "学生班长Id", required = true)
- @NotNull(message = "数据验证失败，学生班长不能为空！")
- private Long leaderId;
-
- /**
- * 已完成课时数量。
- */
- @ApiModelProperty(value = "已完成课时数量", required = true)
- @NotNull(message = "数据验证失败，已完成课时不能为空！", groups = {UpdateGroup.class})
- private Integer finishClassHour;
-
- /**
- * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
- */
- @ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)", required = true)
- @NotNull(message = "数据验证失败，班级级别不能为空！")
- @ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！")
- private Integer classLevel;
-
- /**
- * 创建用户。
- */
- @ApiModelProperty(value = "创建用户")
- private Long createUserId;
-
- /**
- * 班级创建时间。
- */
- @ApiModelProperty(value = "班级创建时间")
- private Date createTime;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java
deleted file mode 100644
index fc8a812c..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dto/StudentDto.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.orangeforms.webadmin.app.dto;
-
-import com.orangeforms.common.core.validator.UpdateGroup;
-import com.orangeforms.common.core.validator.ConstDictRef;
-import com.orangeforms.application.common.constant.Gender;
-import com.orangeforms.application.common.constant.ExpLevel;
-import com.orangeforms.application.common.constant.StudentStatus;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-/**
- * StudentDto对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("StudentDto对象")
-@Data
-public class StudentDto {
-
- /**
- * 学生Id。
- */
- @ApiModelProperty(value = "学生Id", required = true)
- @NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
- private Long studentId;
-
- /**
- * 登录手机。
- */
- @ApiModelProperty(value = "登录手机", required = true)
- @NotBlank(message = "数据验证失败，手机号码不能为空！")
- private String loginMobile;
-
- /**
- * 学生姓名。
- */
- @ApiModelProperty(value = "学生姓名", required = true)
- @NotBlank(message = "数据验证失败，学生姓名不能为空！")
- private String studentName;
-
- /**
- * 所在省份Id。
- */
- @ApiModelProperty(value = "所在省份Id", required = true)
- @NotNull(message = "数据验证失败，所在省份不能为空！")
- private Long provinceId;
-
- /**
- * 所在城市Id。
- */
- @ApiModelProperty(value = "所在城市Id", required = true)
- @NotNull(message = "数据验证失败，所在城市不能为空！")
- private Long cityId;
-
- /**
- * 区县Id。
- */
- @ApiModelProperty(value = "区县Id", required = true)
- @NotNull(message = "数据验证失败，所在区县不能为空！")
- private Long districtId;
-
- /**
- * 学生性别 (0: 女生 1: 男生)。
- */
- @ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)", required = true)
- @NotNull(message = "数据验证失败，学生性别不能为空！")
- @ConstDictRef(constDictClass = Gender.class, message = "数据验证失败，学生性别为无效值！")
- private Integer gender;
-
- /**
- * 生日。
- */
- @ApiModelProperty(value = "生日", required = true)
- @NotNull(message = "数据验证失败，出生日期不能为空！")
- private Date birthday;
-
- /**
- * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
- */
- @ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)", required = true)
- @NotNull(message = "数据验证失败，经验等级不能为空！")
- @ConstDictRef(constDictClass = ExpLevel.class, message = "数据验证失败，经验等级为无效值！")
- private Integer experienceLevel;
-
- /**
- * 总共充值学币数量。
- */
- @ApiModelProperty(value = "总共充值学币数量", required = true)
- @NotNull(message = "数据验证失败，充值学币不能为空！", groups = {UpdateGroup.class})
- private Integer totalCoin;
-
- /**
- * 可用学币数量。
- */
- @ApiModelProperty(value = "可用学币数量")
- private Integer leftCoin;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id", required = true)
- @NotNull(message = "数据验证失败，年级不能为空！")
- private Integer gradeId;
-
- /**
- * 校区Id。
- */
- @ApiModelProperty(value = "校区Id", required = true)
- @NotNull(message = "数据验证失败，所属校区不能为空！")
- private Long schoolId;
-
- /**
- * 注册时间。
- */
- @ApiModelProperty(value = "注册时间", required = true)
- private Date registerTime;
-
- /**
- * 学生状态 (0: 正常 1: 锁定 2: 注销)。
- */
- @ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)", required = true)
- @NotNull(message = "数据验证失败，学生状态不能为空！", groups = {UpdateGroup.class})
- @ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，学生状态为无效值！")
- private Integer status;
-
- /**
- * birthday 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "birthday 范围过滤起始值(>=)")
- private String birthdayStart;
-
- /**
- * birthday 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "birthday 范围过滤结束值(<=)")
- private String birthdayEnd;
-
- /**
- * registerTime 范围过滤起始值(>=)。
- */
- @ApiModelProperty(value = "registerTime 范围过滤起始值(>=)")
- private String registerTimeStart;
-
- /**
- * registerTime 范围过滤结束值(<=)。
- */
- @ApiModelProperty(value = "registerTime 范围过滤结束值(<=)")
- private String registerTimeEnd;
-
- /**
- * login_mobile / student_name LIKE搜索字符串。
- */
- @ApiModelProperty(value = "LIKE模糊搜索字符串")
- private String searchString;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java
deleted file mode 100644
index 312ac88e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * 行政区划实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_area_code")
-public class AreaCode {
-
- /**
- * 行政区划主键Id
- */
- @TableId(value = "area_id")
- private Long areaId;
-
- /**
- * 行政区划名称
- */
- @TableField(value = "area_name")
- private String areaName;
-
- /**
- * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
- */
- @TableField(value = "area_level")
- private Integer areaLevel;
-
- /**
- * 父级行政区划Id
- */
- @TableField(value = "parent_id")
- private Long parentId;
-}
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java
deleted file mode 100644
index 0388bcba..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassCourse.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * ClassCourse实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_class_course")
-public class ClassCourse {
-
- /**
- * 班级Id。
- */
- @TableField(value = "class_id")
- private Long classId;
-
- /**
- * 课程Id。
- */
- @TableField(value = "course_id")
- private Long courseId;
-
- /**
- * 课程顺序(数值越小越靠前)。
- */
- @TableField(value = "course_order")
- private Integer courseOrder;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java
deleted file mode 100644
index de9b65e5..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/ClassStudent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * ClassStudent实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_class_student")
-public class ClassStudent {
-
- /**
- * 班级Id。
- */
- @TableField(value = "class_id")
- private Long classId;
-
- /**
- * 学生Id。
- */
- @TableField(value = "student_id")
- private Long studentId;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java
deleted file mode 100644
index 863f0379..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Course.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.webadmin.app.model.constant.CourseDifficult;
-import com.orangeforms.application.common.constant.Subject;
-import com.orangeforms.common.core.upload.UploadStoreTypeEnum;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.CourseVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * Course实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_course")
-public class Course {
-
- /**
- * 主键Id。
- */
- @TableId(value = "course_id")
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @TableField(value = "course_name")
- private String courseName;
-
- /**
- * 课程价格。
- */
- private BigDecimal price;
-
- /**
- * 课程描述。
- */
- private String description;
-
- /**
- * 课程难度(0: 容易 1: 普通 2: 很难)。
- */
- private Integer difficulty;
-
- /**
- * 年级Id。
- */
- @TableField(value = "grade_id")
- private Integer gradeId;
-
- /**
- * 学科Id。
- */
- @TableField(value = "subject_id")
- private Integer subjectId;
-
- /**
- * 课时数量。
- */
- @TableField(value = "class_hour")
- private Integer classHour;
-
- /**
- * 多张课程图片地址。
- */
- @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
- @TableField(value = "picture_url")
- private String pictureUrl;
-
- /**
- * 创建用户Id。
- */
- @TableField(value = "create_user_id")
- private Long createUserId;
-
- /**
- * 创建时间。
- */
- @TableField(value = "create_time")
- private Date createTime;
-
- /**
- * 最后修改时间。
- */
- @TableField(value = "update_time")
- private Date updateTime;
-
- /**
- * price 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private BigDecimal priceStart;
-
- /**
- * price 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private BigDecimal priceEnd;
-
- /**
- * classHour 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private Integer classHourStart;
-
- /**
- * classHour 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private Integer classHourEnd;
-
- /**
- * createTime 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String createTimeStart;
-
- /**
- * createTime 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String createTimeEnd;
-
- /**
- * courseId 的多对多关联表数据对象。
- */
- @TableField(exist = false)
- private ClassCourse classCourse;
-
- @RelationDict(
- masterIdField = "gradeId",
- slaveServiceName = "gradeService",
- slaveModelClass = Grade.class,
- slaveIdField = "gradeId",
- slaveNameField = "gradeName")
- @TableField(exist = false)
- private Map gradeIdDictMap;
-
- @RelationConstDict(
- masterIdField = "difficulty",
- constantDictClass = CourseDifficult.class)
- @TableField(exist = false)
- private Map difficultyDictMap;
-
- @RelationConstDict(
- masterIdField = "subjectId",
- constantDictClass = Subject.class)
- @TableField(exist = false)
- private Map subjectIdDictMap;
-
- @Mapper
- public interface CourseModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param courseVo 域对象。
- * @return 实体对象。
- */
- @Mapping(target = "classCourse", expression = "java(mapToBean(courseVo.getClassCourse(), com.orangeforms.webadmin.app.model.ClassCourse.class))")
- @Override
- Course toModel(CourseVo courseVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param course 实体对象。
- * @return 域对象。
- */
- @Mapping(target = "classCourse", expression = "java(beanToMap(course.getClassCourse(), false))")
- @Override
- CourseVo fromModel(Course course);
- }
- public static final CourseModelMapper INSTANCE = Mappers.getMapper(CourseModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java
deleted file mode 100644
index f24cfd99..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/CourseTransStats.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.application.common.constant.Subject;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.CourseTransStatsVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * CourseTransStats实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_course_trans_stats")
-public class CourseTransStats {
-
- /**
- * 主键Id。
- */
- @TableId(value = "stats_id", type = IdType.AUTO)
- private Long statsId;
-
- /**
- * 统计日期。
- */
- @TableField(value = "stats_date")
- private Date statsDate;
-
- /**
- * 科目Id。
- */
- @TableField(value = "subject_id")
- private Integer subjectId;
-
- /**
- * 年级Id。
- */
- @TableField(value = "grade_id")
- private Integer gradeId;
-
- /**
- * 年级名称。
- */
- @TableField(value = "grade_name")
- private String gradeName;
-
- /**
- * 课程Id。
- */
- @TableField(value = "course_id")
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @TableField(value = "course_name")
- private String courseName;
-
- /**
- * 学生上课次数。
- */
- @TableField(value = "student_attend_count")
- private Integer studentAttendCount;
-
- /**
- * 学生献花数量。
- */
- @TableField(value = "student_flower_amount")
- private Integer studentFlowerAmount;
-
- /**
- * 学生献花次数。
- */
- @TableField(value = "student_flower_count")
- private Integer studentFlowerCount;
-
- /**
- * statsDate 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String statsDateStart;
-
- /**
- * statsDate 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String statsDateEnd;
-
- @RelationDict(
- masterIdField = "gradeId",
- slaveServiceName = "gradeService",
- slaveModelClass = Grade.class,
- slaveIdField = "gradeId",
- slaveNameField = "gradeName")
- @TableField(exist = false)
- private Map gradeIdDictMap;
-
- @RelationConstDict(
- masterIdField = "subjectId",
- constantDictClass = Subject.class)
- @TableField(exist = false)
- private Map subjectIdDictMap;
-
- @Mapper
- public interface CourseTransStatsModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param courseTransStatsVo 域对象。
- * @return 实体对象。
- */
- @Override
- CourseTransStats toModel(CourseTransStatsVo courseTransStatsVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param courseTransStats 实体对象。
- * @return 域对象。
- */
- @Override
- CourseTransStatsVo fromModel(CourseTransStats courseTransStats);
- }
- public static final CourseTransStatsModelMapper INSTANCE = Mappers.getMapper(CourseTransStatsModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java
deleted file mode 100644
index d5467c4f..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Grade.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * Grade实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_grade")
-public class Grade {
-
- /**
- * 主键Id。
- */
- @TableId(value = "grade_id", type = IdType.AUTO)
- private Integer gradeId;
-
- /**
- * 年级名称。
- */
- @TableField(value = "grade_name")
- private String gradeName;
-
- /**
- * 逻辑删除标记字段(1: 正常 -1: 已删除)。
- */
- @TableLogic
- private Integer status;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java
deleted file mode 100644
index d4b28bb0..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/MaterialEdition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * MaterialEdition实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_material_edition")
-public class MaterialEdition {
-
- /**
- * 主键Id。
- */
- @TableId(value = "edition_id", type = IdType.AUTO)
- private Integer editionId;
-
- /**
- * 教材版本名称。
- */
- @TableField(value = "edition_name")
- private String editionName;
-
- /**
- * 是否正在使用（0：不是，1：是）。
- */
- private Integer status;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java
deleted file mode 100644
index 730f6770..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/Student.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.webadmin.upms.model.SysDept;
-import com.orangeforms.application.common.constant.Gender;
-import com.orangeforms.application.common.constant.ExpLevel;
-import com.orangeforms.application.common.constant.StudentStatus;
-import com.orangeforms.common.core.util.MyCommonUtil;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.StudentVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * Student实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_student")
-public class Student {
-
- /**
- * 学生Id。
- */
- @TableId(value = "student_id")
- private Long studentId;
-
- /**
- * 登录手机。
- */
- @TableField(value = "login_mobile")
- private String loginMobile;
-
- /**
- * 学生姓名。
- */
- @TableField(value = "student_name")
- private String studentName;
-
- /**
- * 所在省份Id。
- */
- @TableField(value = "province_id")
- private Long provinceId;
-
- /**
- * 所在城市Id。
- */
- @TableField(value = "city_id")
- private Long cityId;
-
- /**
- * 区县Id。
- */
- @TableField(value = "district_id")
- private Long districtId;
-
- /**
- * 学生性别 (0: 女生 1: 男生)。
- */
- private Integer gender;
-
- /**
- * 生日。
- */
- private Date birthday;
-
- /**
- * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
- */
- @TableField(value = "experience_level")
- private Integer experienceLevel;
-
- /**
- * 总共充值学币数量。
- */
- @TableField(value = "total_coin")
- private Integer totalCoin;
-
- /**
- * 可用学币数量。
- */
- @TableField(value = "left_coin")
- private Integer leftCoin;
-
- /**
- * 年级Id。
- */
- @TableField(value = "grade_id")
- private Integer gradeId;
-
- /**
- * 校区Id。
- */
- @TableField(value = "school_id")
- private Long schoolId;
-
- /**
- * 注册时间。
- */
- @TableField(value = "register_time")
- private Date registerTime;
-
- /**
- * 学生状态 (0: 正常 1: 锁定 2: 注销)。
- */
- private Integer status;
-
- /**
- * birthday 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String birthdayStart;
-
- /**
- * birthday 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String birthdayEnd;
-
- /**
- * registerTime 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String registerTimeStart;
-
- /**
- * registerTime 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String registerTimeEnd;
-
- /**
- * login_mobile / student_name LIKE搜索字符串。
- */
- @TableField(exist = false)
- private String searchString;
-
- public void setSearchString(String searchString) {
- this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
- }
-
- @RelationDict(
- masterIdField = "provinceId",
- slaveServiceName = "areaCodeService",
- slaveModelClass = AreaCode.class,
- slaveIdField = "areaId",
- slaveNameField = "areaName")
- @TableField(exist = false)
- private Map provinceIdDictMap;
-
- @RelationDict(
- masterIdField = "cityId",
- slaveServiceName = "areaCodeService",
- slaveModelClass = AreaCode.class,
- slaveIdField = "areaId",
- slaveNameField = "areaName")
- @TableField(exist = false)
- private Map cityIdDictMap;
-
- @RelationDict(
- masterIdField = "districtId",
- slaveServiceName = "areaCodeService",
- slaveModelClass = AreaCode.class,
- slaveIdField = "areaId",
- slaveNameField = "areaName")
- @TableField(exist = false)
- private Map districtIdDictMap;
-
- @RelationDict(
- masterIdField = "gradeId",
- slaveServiceName = "gradeService",
- slaveModelClass = Grade.class,
- slaveIdField = "gradeId",
- slaveNameField = "gradeName")
- @TableField(exist = false)
- private Map gradeIdDictMap;
-
- @RelationDict(
- masterIdField = "schoolId",
- slaveServiceName = "sysDeptService",
- slaveModelClass = SysDept.class,
- slaveIdField = "deptId",
- slaveNameField = "deptName")
- @TableField(exist = false)
- private Map schoolIdDictMap;
-
- @RelationConstDict(
- masterIdField = "gender",
- constantDictClass = Gender.class)
- @TableField(exist = false)
- private Map genderDictMap;
-
- @RelationConstDict(
- masterIdField = "experienceLevel",
- constantDictClass = ExpLevel.class)
- @TableField(exist = false)
- private Map experienceLevelDictMap;
-
- @RelationConstDict(
- masterIdField = "status",
- constantDictClass = StudentStatus.class)
- @TableField(exist = false)
- private Map statusDictMap;
-
- @Mapper
- public interface StudentModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param studentVo 域对象。
- * @return 实体对象。
- */
- @Override
- Student toModel(StudentVo studentVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param student 实体对象。
- * @return 域对象。
- */
- @Override
- StudentVo fromModel(Student student);
- }
- public static final StudentModelMapper INSTANCE = Mappers.getMapper(StudentModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java
deleted file mode 100644
index 8966bec0..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionStats.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.StudentActionStatsVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * StudentActionStats实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_student_action_stats")
-public class StudentActionStats {
-
- /**
- * 主键Id。
- */
- @TableId(value = "stats_id")
- private Long statsId;
-
- /**
- * 统计日期。
- */
- @TableField(value = "stats_date")
- private Date statsDate;
-
- /**
- * 统计小时。
- */
- @TableField(value = "stats_month")
- private Date statsMonth;
-
- /**
- * 年级Id。
- */
- @TableField(value = "grade_id")
- private Integer gradeId;
-
- /**
- * 学生所在省Id。
- */
- @TableField(value = "province_id")
- private Long provinceId;
-
- /**
- * 学生所在城市Id。
- */
- @TableField(value = "city_id")
- private Long cityId;
-
- /**
- * 购课学币数量。
- */
- @TableField(value = "buy_course_amount")
- private Integer buyCourseAmount;
-
- /**
- * 购买课程次数。
- */
- @TableField(value = "buy_course_count")
- private Integer buyCourseCount;
-
- /**
- * 购买视频学币数量。
- */
- @TableField(value = "buy_video_amount")
- private Integer buyVideoAmount;
-
- /**
- * 购买视频次数。
- */
- @TableField(value = "buy_video_count")
- private Integer buyVideoCount;
-
- /**
- * 购买作业学币数量。
- */
- @TableField(value = "buy_paper_amount")
- private Integer buyPaperAmount;
-
- /**
- * 购买作业次数。
- */
- @TableField(value = "buy_paper_count")
- private Integer buyPaperCount;
-
- /**
- * 购买献花数量。
- */
- @TableField(value = "buy_flower_amount")
- private Integer buyFlowerAmount;
-
- /**
- * 购买献花次数。
- */
- @TableField(value = "buy_flower_count")
- private Integer buyFlowerCount;
-
- /**
- * 充值学币数量。
- */
- @TableField(value = "recharge_coin_amount")
- private Integer rechargeCoinAmount;
-
- /**
- * 充值学币次数。
- */
- @TableField(value = "recharge_coin_count")
- private Integer rechargeCoinCount;
-
- /**
- * 线下课程上课次数。
- */
- @TableField(value = "do_course_count")
- private Integer doCourseCount;
-
- /**
- * 观看视频次数。
- */
- @TableField(value = "watch_video_count")
- private Integer watchVideoCount;
-
- /**
- * 购买献花消费学币数量。
- */
- @TableField(value = "watch_video_total_second")
- private Integer watchVideoTotalSecond;
-
- /**
- * 做题数量。
- */
- @TableField(value = "do_exercise_count")
- private Integer doExerciseCount;
-
- /**
- * 做题正确的数量。
- */
- @TableField(value = "do_exercise_correct_count")
- private Integer doExerciseCorrectCount;
-
- /**
- * statsDate 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String statsDateStart;
-
- /**
- * statsDate 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String statsDateEnd;
-
- @RelationDict(
- masterIdField = "gradeId",
- slaveServiceName = "gradeService",
- slaveModelClass = Grade.class,
- slaveIdField = "gradeId",
- slaveNameField = "gradeName")
- @TableField(exist = false)
- private Map gradeIdDictMap;
-
- @RelationDict(
- masterIdField = "provinceId",
- slaveServiceName = "areaCodeService",
- slaveModelClass = AreaCode.class,
- slaveIdField = "areaId",
- slaveNameField = "areaName")
- @TableField(exist = false)
- private Map provinceIdDictMap;
-
- @RelationDict(
- masterIdField = "cityId",
- slaveServiceName = "areaCodeService",
- slaveModelClass = AreaCode.class,
- slaveIdField = "areaId",
- slaveNameField = "areaName")
- @TableField(exist = false)
- private Map cityIdDictMap;
-
- @Mapper
- public interface StudentActionStatsModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param studentActionStatsVo 域对象。
- * @return 实体对象。
- */
- @Override
- StudentActionStats toModel(StudentActionStatsVo studentActionStatsVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param studentActionStats 实体对象。
- * @return 域对象。
- */
- @Override
- StudentActionStatsVo fromModel(StudentActionStats studentActionStats);
- }
- public static final StudentActionStatsModelMapper INSTANCE = Mappers.getMapper(StudentActionStatsModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java
deleted file mode 100644
index f2471cd3..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentActionTrans.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.webadmin.upms.model.SysDept;
-import com.orangeforms.application.common.constant.StudentActionType;
-import com.orangeforms.application.common.constant.DeviceType;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.StudentActionTransVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * StudentActionTrans实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_student_action_trans")
-public class StudentActionTrans {
-
- /**
- * 主键Id。
- */
- @TableId(value = "trans_id")
- private Long transId;
-
- /**
- * 学生Id。
- */
- @TableField(value = "student_id")
- private Long studentId;
-
- /**
- * 学生名称。
- */
- @TableField(value = "student_name")
- private String studentName;
-
- /**
- * 学生校区。
- */
- @TableField(value = "school_id")
- private Long schoolId;
-
- /**
- * 年级Id。
- */
- @TableField(value = "grade_id")
- private Integer gradeId;
-
- /**
- * 行为类型(0: 充值 1: 购课 2: 上课签到 3: 上课签退 4: 看视频课 5: 做作业 6: 刷题 7: 献花)。
- */
- @TableField(value = "action_type")
- private Integer actionType;
-
- /**
- * 设备类型(0: iOS 1: Android 2: PC)。
- */
- @TableField(value = "device_type")
- private Integer deviceType;
-
- /**
- * 看视频秒数。
- */
- @TableField(value = "watch_video_seconds")
- private Integer watchVideoSeconds;
-
- /**
- * 购买献花数量。
- */
- @TableField(value = "flower_count")
- private Integer flowerCount;
-
- /**
- * 购买作业数量。
- */
- @TableField(value = "paper_count")
- private Integer paperCount;
-
- /**
- * 购买视频数量。
- */
- @TableField(value = "video_count")
- private Integer videoCount;
-
- /**
- * 购买课程数量。
- */
- @TableField(value = "course_count")
- private Integer courseCount;
-
- /**
- * 充值学币数量。
- */
- @TableField(value = "coin_count")
- private Integer coinCount;
-
- /**
- * 做题是否正确标记。
- */
- @TableField(value = "exercise_correct_flag")
- private Integer exerciseCorrectFlag;
-
- /**
- * 发生时间。
- */
- @TableField(value = "create_time")
- private Date createTime;
-
- /**
- * createTime 范围过滤起始值(>=)。
- */
- @TableField(exist = false)
- private String createTimeStart;
-
- /**
- * createTime 范围过滤结束值(<=)。
- */
- @TableField(exist = false)
- private String createTimeEnd;
-
- @RelationDict(
- masterIdField = "schoolId",
- slaveServiceName = "sysDeptService",
- slaveModelClass = SysDept.class,
- slaveIdField = "deptId",
- slaveNameField = "deptName")
- @TableField(exist = false)
- private Map schoolIdDictMap;
-
- @RelationDict(
- masterIdField = "gradeId",
- slaveServiceName = "gradeService",
- slaveModelClass = Grade.class,
- slaveIdField = "gradeId",
- slaveNameField = "gradeName")
- @TableField(exist = false)
- private Map gradeIdDictMap;
-
- @RelationConstDict(
- masterIdField = "actionType",
- constantDictClass = StudentActionType.class)
- @TableField(exist = false)
- private Map actionTypeDictMap;
-
- @RelationConstDict(
- masterIdField = "deviceType",
- constantDictClass = DeviceType.class)
- @TableField(exist = false)
- private Map deviceTypeDictMap;
-
- @Mapper
- public interface StudentActionTransModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param studentActionTransVo 域对象。
- * @return 实体对象。
- */
- @Override
- StudentActionTrans toModel(StudentActionTransVo studentActionTransVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param studentActionTrans 实体对象。
- * @return 域对象。
- */
- @Override
- StudentActionTransVo fromModel(StudentActionTrans studentActionTrans);
- }
- public static final StudentActionTransModelMapper INSTANCE = Mappers.getMapper(StudentActionTransModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java
deleted file mode 100644
index e90c8143..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/StudentClass.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.orangeforms.webadmin.app.model;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.orangeforms.webadmin.upms.model.SysDept;
-import com.orangeforms.webadmin.app.model.constant.ClassLevel;
-import com.orangeforms.common.core.annotation.*;
-import com.orangeforms.common.core.base.mapper.BaseModelMapper;
-import com.orangeforms.webadmin.app.vo.StudentClassVo;
-import lombok.Data;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * StudentClass实体对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Data
-@TableName(value = "zz_class")
-public class StudentClass {
-
- /**
- * 班级Id。
- */
- @TableId(value = "class_id")
- private Long classId;
-
- /**
- * 班级名称。
- */
- @TableField(value = "class_name")
- private String className;
-
- /**
- * 学校Id。
- */
- @TableField(value = "school_id")
- private Long schoolId;
-
- /**
- * 学生班长Id。
- */
- @TableField(value = "leader_id")
- private Long leaderId;
-
- /**
- * 已完成课时数量。
- */
- @TableField(value = "finish_class_hour")
- private Integer finishClassHour;
-
- /**
- * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
- */
- @TableField(value = "class_level")
- private Integer classLevel;
-
- /**
- * 创建用户。
- */
- @TableField(value = "create_user_id")
- private Long createUserId;
-
- /**
- * 班级创建时间。
- */
- @TableField(value = "create_time")
- private Date createTime;
-
- /**
- * 逻辑删除标记字段(1: 正常 -1: 已删除)。
- */
- @TableLogic
- private Integer status;
-
- @RelationDict(
- masterIdField = "schoolId",
- slaveServiceName = "sysDeptService",
- slaveModelClass = SysDept.class,
- slaveIdField = "deptId",
- slaveNameField = "deptName")
- @TableField(exist = false)
- private Map schoolIdDictMap;
-
- @RelationDict(
- masterIdField = "leaderId",
- slaveServiceName = "studentService",
- slaveModelClass = Student.class,
- slaveIdField = "studentId",
- slaveNameField = "studentName")
- @TableField(exist = false)
- private Map leaderIdDictMap;
-
- @RelationConstDict(
- masterIdField = "classLevel",
- constantDictClass = ClassLevel.class)
- @TableField(exist = false)
- private Map classLevelDictMap;
-
- @Mapper
- public interface StudentClassModelMapper extends BaseModelMapper {
- /**
- * 转换Vo对象到实体对象。
- *
- * @param studentClassVo 域对象。
- * @return 实体对象。
- */
- @Override
- StudentClass toModel(StudentClassVo studentClassVo);
- /**
- * 转换实体对象到VO对象。
- *
- * @param studentClass 实体对象。
- * @return 域对象。
- */
- @Override
- StudentClassVo fromModel(StudentClass studentClass);
- }
- public static final StudentClassModelMapper INSTANCE = Mappers.getMapper(StudentClassModelMapper.class);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java
deleted file mode 100644
index 00470cef..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassLevel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.webadmin.app.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 班级级别常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class ClassLevel {
-
- /**
- * 初级班。
- */
- public static final int NORMAL = 0;
- /**
- * 中级班。
- */
- public static final int MIDDLE = 1;
- /**
- * 高级班。
- */
- public static final int HIGH = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(NORMAL, "初级班");
- DICT_MAP.put(MIDDLE, "中级班");
- DICT_MAP.put(HIGH, "高级班");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private ClassLevel() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java
deleted file mode 100644
index a7f8bee7..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/ClassStatus.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.orangeforms.webadmin.app.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 班级状态常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class ClassStatus {
-
- /**
- * 正常。
- */
- public static final int NORAML = 1;
- /**
- * 解散。
- */
- public static final int DELETED = -1;
-
- private static final Map DICT_MAP = new HashMap<>(2);
- static {
- DICT_MAP.put(NORAML, "正常");
- DICT_MAP.put(DELETED, "解散");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private ClassStatus() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java
deleted file mode 100644
index 3a9e36a2..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/constant/CourseDifficult.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.webadmin.app.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 课程难度常量字典对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public final class CourseDifficult {
-
- /**
- * 容易。
- */
- public static final int NORMAL = 0;
- /**
- * 普通。
- */
- public static final int MIDDLE = 1;
- /**
- * 困难。
- */
- public static final int HIGH = 2;
-
- private static final Map DICT_MAP = new HashMap<>(3);
- static {
- DICT_MAP.put(NORMAL, "容易");
- DICT_MAP.put(MIDDLE, "普通");
- DICT_MAP.put(HIGH, "困难");
- }
-
- /**
- * 判断参数是否为当前常量字典的合法值。
- *
- * @param value 待验证的参数值。
- * @return 合法返回true，否则false。
- */
- public static boolean isValid(Integer value) {
- return value != null && DICT_MAP.containsKey(value);
- }
-
- /**
- * 私有构造函数，明确标识该常量类的作用。
- */
- private CourseDifficult() {
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java
deleted file mode 100644
index dbe2ae67..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.common.core.base.service.IBaseDictService;
-import com.orangeforms.webadmin.app.model.AreaCode;
-
-import java.util.Collection;
-
-/**
- * 行政区划的Service接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface AreaCodeService extends IBaseDictService {
-
- /**
- * 根据上级行政区划Id，获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 下级行政区划列表。
- */
- Collection getListByParentId(Long parentId);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java
deleted file mode 100644
index beb74cfb..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 课程数据数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface CourseService extends IBaseService {
-
- /**
- * 保存新增对象。
- *
- * @param course 新增对象。
- * @return 返回新增对象。
- */
- Course saveNew(Course course);
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param courseList 新增对象列表。
- */
- void saveNewBatch(List courseList);
-
- /**
- * 更新数据对象。
- *
- * @param course 更新的对象。
- * @param originalCourse 原有数据对象。
- * @return 成功返回true，否则false。
- */
- boolean update(Course course, Course originalCourse);
-
- /**
- * 删除指定数据。
- *
- * @param courseId 主键Id。
- * @return 成功返回true，否则false。
- */
- boolean remove(Long courseId);
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getCourseListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getCourseList(Course filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getCourseList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getCourseListWithRelation(Course filter, String orderBy);
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getNotInCourseListByClassId(Long classId, Course filter, String orderBy);
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getCourseListByClassId(Long classId, Course filter, String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java
deleted file mode 100644
index 860cb3c9..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/CourseTransStatsService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 课程统计数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface CourseTransStatsService extends IBaseService {
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getCourseTransStatsListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getCourseTransStatsList(CourseTransStats filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getCourseTransStatsList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getCourseTransStatsListWithRelation(CourseTransStats filter, String orderBy);
-
- /**
- * 获取分组过滤后的数据查询结果，以及关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- *
- * @param filter 过滤对象。
- * @param groupSelect 分组显示列表参数。位于SQL语句SELECT的后面。
- * @param groupBy 分组参数。位于SQL语句的GROUP BY后面。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 分组过滤结果集。
- */
- List getGroupedCourseTransStatsListWithRelation(
- CourseTransStats filter, String groupSelect, String groupBy, String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java
deleted file mode 100644
index 91bb133f..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/GradeService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.common.core.base.service.IBaseDictService;
-import com.orangeforms.webadmin.app.model.Grade;
-
-/**
- * 年级字典数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface GradeService extends IBaseDictService {
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java
deleted file mode 100644
index fb7c7202..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionStatsService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 学生行为统计数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentActionStatsService extends IBaseService {
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentActionStatsListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentActionStatsList(StudentActionStats filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentActionStatsList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentActionStatsListWithRelation(StudentActionStats filter, String orderBy);
-
- /**
- * 获取分组过滤后的数据查询结果，以及关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- *
- * @param filter 过滤对象。
- * @param groupSelect 分组显示列表参数。位于SQL语句SELECT的后面。
- * @param groupBy 分组参数。位于SQL语句的GROUP BY后面。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 分组过滤结果集。
- */
- List getGroupedStudentActionStatsListWithRelation(
- StudentActionStats filter, String groupSelect, String groupBy, String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java
deleted file mode 100644
index 9c3d0fff..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentActionTransService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 学生行为流水数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentActionTransService extends IBaseService {
-
- /**
- * 保存新增对象。
- *
- * @param studentActionTrans 新增对象。
- * @return 返回新增对象。
- */
- StudentActionTrans saveNew(StudentActionTrans studentActionTrans);
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentActionTransList 新增对象列表。
- */
- void saveNewBatch(List studentActionTransList);
-
- /**
- * 更新数据对象。
- *
- * @param studentActionTrans 更新的对象。
- * @param originalStudentActionTrans 原有数据对象。
- * @return 成功返回true，否则false。
- */
- boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans);
-
- /**
- * 删除指定数据。
- *
- * @param transId 主键Id。
- * @return 成功返回true，否则false。
- */
- boolean remove(Long transId);
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentActionTransListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentActionTransList(StudentActionTrans filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentActionTransList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentActionTransListWithRelation(StudentActionTrans filter, String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java
deleted file mode 100644
index 935b527c..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentClassService.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 班级数据数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentClassService extends IBaseService {
-
- /**
- * 保存新增对象。
- *
- * @param studentClass 新增对象。
- * @return 返回新增对象。
- */
- StudentClass saveNew(StudentClass studentClass);
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentClassList 新增对象列表。
- */
- void saveNewBatch(List studentClassList);
-
- /**
- * 更新数据对象。
- *
- * @param studentClass 更新的对象。
- * @param originalStudentClass 原有数据对象。
- * @return 成功返回true，否则false。
- */
- boolean update(StudentClass studentClass, StudentClass originalStudentClass);
-
- /**
- * 删除指定数据。
- *
- * @param classId 主键Id。
- * @return 成功返回true，否则false。
- */
- boolean remove(Long classId);
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentClassListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentClassList(StudentClass filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentClassList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentClassListWithRelation(StudentClass filter, String orderBy);
-
- /**
- * 批量添加多对多关联关系。
- *
- * @param classCourseList 多对多关联表对象集合。
- * @param classId 主表Id。
- */
- void addClassCourseList(List classCourseList, Long classId);
-
- /**
- * 更新中间表数据。
- *
- * @param classCourse 中间表对象。
- * @return 更新成功与否。
- */
- boolean updateClassCourse(ClassCourse classCourse);
-
- /**
- * 获取中间表数据。
- *
- * @param classId 主表Id。
- * @param courseId 从表Id。
- * @return 中间表对象。
- */
- ClassCourse getClassCourse(Long classId, Long courseId);
-
- /**
- * 移除单条多对多关系。
- *
- * @param classId 主表Id。
- * @param courseId 从表Id。
- * @return 成功返回true，否则false。
- */
- boolean removeClassCourse(Long classId, Long courseId);
-
- /**
- * 批量添加多对多关联关系。
- *
- * @param classStudentList 多对多关联表对象集合。
- * @param classId 主表Id。
- */
- void addClassStudentList(List classStudentList, Long classId);
-
- /**
- * 移除单条多对多关系。
- *
- * @param classId 主表Id。
- * @param studentId 从表Id。
- * @return 成功返回true，否则false。
- */
- boolean removeClassStudent(Long classId, Long studentId);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java
deleted file mode 100644
index 1ab0df50..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/StudentService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.orangeforms.webadmin.app.service;
-
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.service.IBaseService;
-
-import java.util.*;
-
-/**
- * 学生数据数据操作服务接口。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-public interface StudentService extends IBaseService {
-
- /**
- * 保存新增对象。
- *
- * @param student 新增对象。
- * @return 返回新增对象。
- */
- Student saveNew(Student student);
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentList 新增对象列表。
- */
- void saveNewBatch(List studentList);
-
- /**
- * 更新数据对象。
- *
- * @param student 更新的对象。
- * @param originalStudent 原有数据对象。
- * @return 成功返回true，否则false。
- */
- boolean update(Student student, Student originalStudent);
-
- /**
- * 删除指定数据。
- *
- * @param studentId 主键Id。
- * @return 成功返回true，否则false。
- */
- boolean remove(Long studentId);
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentList(Student filter, String orderBy);
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentListWithRelation(Student filter, String orderBy);
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getNotInStudentListByClassId(Long classId, Student filter, String orderBy);
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- List getStudentListByClassId(Long classId, Student filter, String orderBy);
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java
deleted file mode 100644
index e4a61722..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import com.orangeforms.webadmin.app.service.AreaCodeService;
-import com.orangeforms.webadmin.app.dao.AreaCodeMapper;
-import com.orangeforms.webadmin.app.model.AreaCode;
-import com.orangeforms.common.core.cache.MapTreeDictionaryCache;
-import com.orangeforms.common.core.base.service.BaseDictService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import java.util.Collection;
-
-/**
- * 行政区划的Service类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Service("areaCodeService")
-public class AreaCodeServiceImpl extends BaseDictService implements AreaCodeService {
-
- @Autowired
- private AreaCodeMapper areaCodeMapper;
-
- public AreaCodeServiceImpl() {
- super();
- this.dictionaryCache = MapTreeDictionaryCache.create(AreaCode::getAreaId, AreaCode::getParentId);
- }
-
- @PostConstruct
- public void init() {
- this.reloadCachedData(true);
- }
-
- @Override
- protected BaseDaoMapper mapper() {
- return areaCodeMapper;
- }
-
- /**
- * 根据上级行政区划Id，获取其下级行政区划列表。
- *
- * @param parentId 上级行政区划Id。
- * @return 下级行政区划列表。
- */
- @Override
- public Collection getListByParentId(Long parentId) {
- return ((MapTreeDictionaryCache) dictionaryCache).getListByParentId(parentId);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java
deleted file mode 100644
index f96f33d8..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseServiceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.*;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.object.TokenData;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.object.CallResult;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 课程数据数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("courseService")
-public class CourseServiceImpl extends BaseService implements CourseService {
-
- @Autowired
- private CourseMapper courseMapper;
- @Autowired
- private ClassCourseMapper classCourseMapper;
- @Autowired
- private GradeService gradeService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return courseMapper;
- }
-
- /**
- * 保存新增对象。
- *
- * @param course 新增对象。
- * @return 返回新增对象。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public Course saveNew(Course course) {
- courseMapper.insert(this.buildDefaultValue(course));
- return course;
- }
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param courseList 新增对象列表。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void saveNewBatch(List courseList) {
- if (CollUtil.isNotEmpty(courseList)) {
- courseList.forEach(this::buildDefaultValue);
- courseMapper.insertList(courseList);
- }
- }
-
- /**
- * 更新数据对象。
- *
- * @param course 更新的对象。
- * @param originalCourse 原有数据对象。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean update(Course course, Course originalCourse) {
- course.setCreateUserId(originalCourse.getCreateUserId());
- course.setCreateTime(originalCourse.getCreateTime());
- course.setUpdateTime(new Date());
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(course, course.getCourseId());
- return courseMapper.update(course, uw) == 1;
- }
-
- /**
- * 删除指定数据。
- *
- * @param courseId 主键Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean remove(Long courseId) {
- if (courseMapper.deleteById(courseId) == 0) {
- return false;
- }
- // 开始删除多对多父表的关联
- ClassCourse classCourse = new ClassCourse();
- classCourse.setCourseId(courseId);
- classCourseMapper.delete(new QueryWrapper<>(classCourse));
- return true;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getCourseListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getCourseList(Course filter, String orderBy) {
- return courseMapper.getCourseList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getCourseList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getCourseListWithRelation(Course filter, String orderBy) {
- List resultList = courseMapper.getCourseList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getNotInCourseListByClassId(Long classId, Course filter, String orderBy) {
- List resultList;
- if (classId != null) {
- resultList = courseMapper.getNotInCourseListByClassId(classId, filter, orderBy);
- } else {
- resultList = getCourseList(filter, orderBy);
- }
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
- return resultList;
- }
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getCourseListByClassId(Long classId, Course filter, String orderBy) {
- List resultList =
- courseMapper.getCourseListByClassId(classId, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
- return resultList;
- }
-
- /**
- * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
- *
- * @param course 最新数据对象。
- * @param originalCourse 原有数据对象。
- * @return 数据全部正确返回true，否则false。
- */
- @Override
- public CallResult verifyRelatedData(Course course, Course originalCourse) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- //这里是基于字典的验证。
- if (this.needToVerify(course, originalCourse, Course::getGradeId)
- && !gradeService.existId(course.getGradeId())) {
- return CallResult.error(String.format(errorMessageFormat, "所属年级"));
- }
- return CallResult.ok();
- }
-
- private Course buildDefaultValue(Course course) {
- course.setCourseId(idGenerator.nextLongId());
- TokenData tokenData = TokenData.takeFromRequest();
- course.setCreateUserId(tokenData.getUserId());
- Date now = new Date();
- course.setCreateTime(now);
- course.setUpdateTime(now);
- return course;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java
deleted file mode 100644
index 6aae014a..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/CourseTransStatsServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 课程统计数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("courseTransStatsService")
-public class CourseTransStatsServiceImpl extends BaseService implements CourseTransStatsService {
-
- @Autowired
- private CourseTransStatsMapper courseTransStatsMapper;
- @Autowired
- private GradeService gradeService;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return courseTransStatsMapper;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getCourseTransStatsListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getCourseTransStatsList(CourseTransStats filter, String orderBy) {
- return courseTransStatsMapper.getCourseTransStatsList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getCourseTransStatsList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getCourseTransStatsListWithRelation(CourseTransStats filter, String orderBy) {
- List resultList = courseTransStatsMapper.getCourseTransStatsList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 获取分组过滤后的数据查询结果，以及关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- *
- * @param filter 过滤对象。
- * @param groupSelect 分组显示列表参数。位于SQL语句SELECT的后面。
- * @param groupBy 分组参数。位于SQL语句的GROUP BY后面。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 分组过滤结果集。
- */
- @Override
- public List getGroupedCourseTransStatsListWithRelation(
- CourseTransStats filter, String groupSelect, String groupBy, String orderBy) {
- List resultList =
- courseTransStatsMapper.getGroupedCourseTransStatsList(filter, groupSelect, groupBy, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- // NOTE: 这里只是包含了关联数据，聚合计算数据没有包含。
- // 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java
deleted file mode 100644
index 4c5f45cf..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/GradeServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import com.orangeforms.common.core.base.service.BaseDictService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.redis.cache.RedisDictionaryCache;
-import com.orangeforms.webadmin.app.service.GradeService;
-import com.orangeforms.webadmin.app.dao.GradeMapper;
-import com.orangeforms.webadmin.app.model.Grade;
-import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-
-/**
- * 年级字典数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("gradeService")
-public class GradeServiceImpl extends BaseDictService implements GradeService {
-
- @Autowired
- private GradeMapper gradeMapper;
- @Autowired
- private RedissonClient redissonClient;
-
- public GradeServiceImpl() {
- super();
- }
-
- @PostConstruct
- public void init() {
- this.dictionaryCache = RedisDictionaryCache.create(
- redissonClient, "Grade", Grade.class, Grade::getGradeId);
- }
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return gradeMapper;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java
deleted file mode 100644
index 709c810f..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionStatsServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 学生行为统计数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("studentActionStatsService")
-public class StudentActionStatsServiceImpl extends BaseService implements StudentActionStatsService {
-
- @Autowired
- private StudentActionStatsMapper studentActionStatsMapper;
- @Autowired
- private GradeService gradeService;
- @Autowired
- private AreaCodeService areaCodeService;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return studentActionStatsMapper;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentActionStatsListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentActionStatsList(StudentActionStats filter, String orderBy) {
- return studentActionStatsMapper.getStudentActionStatsList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentActionStatsList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentActionStatsListWithRelation(StudentActionStats filter, String orderBy) {
- List resultList = studentActionStatsMapper.getStudentActionStatsList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 获取分组过滤后的数据查询结果，以及关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- *
- * @param filter 过滤对象。
- * @param groupSelect 分组显示列表参数。位于SQL语句SELECT的后面。
- * @param groupBy 分组参数。位于SQL语句的GROUP BY后面。
- * @param orderBy 排序字符串，ORDER BY从句的参数。
- * @return 分组过滤结果集。
- */
- @Override
- public List getGroupedStudentActionStatsListWithRelation(
- StudentActionStats filter, String groupSelect, String groupBy, String orderBy) {
- List resultList =
- studentActionStatsMapper.getGroupedStudentActionStatsList(filter, groupSelect, groupBy, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- // NOTE: 这里只是包含了关联数据，聚合计算数据没有包含。
- // 主要原因是，由于聚合字段通常被视为普通字段使用，不会在group by的从句中出现，语义上也不会在此关联。
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java
deleted file mode 100644
index ad76b07c..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentActionTransServiceImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.webadmin.upms.service.SysDeptService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.object.CallResult;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 学生行为流水数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("studentActionTransService")
-public class StudentActionTransServiceImpl extends BaseService implements StudentActionTransService {
-
- @Autowired
- private StudentActionTransMapper studentActionTransMapper;
- @Autowired
- private SysDeptService sysDeptService;
- @Autowired
- private GradeService gradeService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return studentActionTransMapper;
- }
-
- /**
- * 保存新增对象。
- *
- * @param studentActionTrans 新增对象。
- * @return 返回新增对象。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public StudentActionTrans saveNew(StudentActionTrans studentActionTrans) {
- studentActionTransMapper.insert(this.buildDefaultValue(studentActionTrans));
- return studentActionTrans;
- }
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentActionTransList 新增对象列表。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void saveNewBatch(List studentActionTransList) {
- if (CollUtil.isNotEmpty(studentActionTransList)) {
- studentActionTransList.forEach(this::buildDefaultValue);
- studentActionTransMapper.insertList(studentActionTransList);
- }
- }
-
- /**
- * 更新数据对象。
- *
- * @param studentActionTrans 更新的对象。
- * @param originalStudentActionTrans 原有数据对象。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean update(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(studentActionTrans, studentActionTrans.getTransId());
- return studentActionTransMapper.update(studentActionTrans, uw) == 1;
- }
-
- /**
- * 删除指定数据。
- *
- * @param transId 主键Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean remove(Long transId) {
- return studentActionTransMapper.deleteById(transId) == 1;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentActionTransListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentActionTransList(StudentActionTrans filter, String orderBy) {
- return studentActionTransMapper.getStudentActionTransList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentActionTransList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentActionTransListWithRelation(StudentActionTrans filter, String orderBy) {
- List resultList = studentActionTransMapper.getStudentActionTransList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
- *
- * @param studentActionTrans 最新数据对象。
- * @param originalStudentActionTrans 原有数据对象。
- * @return 数据全部正确返回true，否则false。
- */
- @Override
- public CallResult verifyRelatedData(StudentActionTrans studentActionTrans, StudentActionTrans originalStudentActionTrans) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- //这里是基于字典的验证。
- if (this.needToVerify(studentActionTrans, originalStudentActionTrans, StudentActionTrans::getSchoolId)
- && !sysDeptService.existId(studentActionTrans.getSchoolId())) {
- return CallResult.error(String.format(errorMessageFormat, "学生校区"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(studentActionTrans, originalStudentActionTrans, StudentActionTrans::getGradeId)
- && !gradeService.existId(studentActionTrans.getGradeId())) {
- return CallResult.error(String.format(errorMessageFormat, "学生年级"));
- }
- return CallResult.ok();
- }
-
- private StudentActionTrans buildDefaultValue(StudentActionTrans studentActionTrans) {
- studentActionTrans.setTransId(idGenerator.nextLongId());
- return studentActionTrans;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java
deleted file mode 100644
index b2347fc7..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentClassServiceImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.*;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.webadmin.upms.service.SysDeptService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.constant.GlobalDeletedFlag;
-import com.orangeforms.common.core.object.TokenData;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.object.CallResult;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.orangeforms.common.core.util.MyModelUtil;
-import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 班级数据数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("studentClassService")
-public class StudentClassServiceImpl extends BaseService implements StudentClassService {
-
- @Autowired
- private StudentClassMapper studentClassMapper;
- @Autowired
- private ClassCourseMapper classCourseMapper;
- @Autowired
- private ClassStudentMapper classStudentMapper;
- @Autowired
- private SysDeptService sysDeptService;
- @Autowired
- private StudentService studentService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return studentClassMapper;
- }
-
- /**
- * 保存新增对象。
- *
- * @param studentClass 新增对象。
- * @return 返回新增对象。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public StudentClass saveNew(StudentClass studentClass) {
- studentClassMapper.insert(this.buildDefaultValue(studentClass));
- return studentClass;
- }
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentClassList 新增对象列表。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void saveNewBatch(List studentClassList) {
- if (CollUtil.isNotEmpty(studentClassList)) {
- studentClassList.forEach(this::buildDefaultValue);
- studentClassMapper.insertList(studentClassList);
- }
- }
-
- /**
- * 更新数据对象。
- *
- * @param studentClass 更新的对象。
- * @param originalStudentClass 原有数据对象。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean update(StudentClass studentClass, StudentClass originalStudentClass) {
- studentClass.setCreateUserId(originalStudentClass.getCreateUserId());
- studentClass.setCreateTime(originalStudentClass.getCreateTime());
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(studentClass, studentClass.getClassId());
- return studentClassMapper.update(studentClass, uw) == 1;
- }
-
- /**
- * 删除指定数据。
- *
- * @param classId 主键Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean remove(Long classId) {
- if (studentClassMapper.deleteById(classId) == 0) {
- return false;
- }
- // 开始删除多对多子表的关联
- ClassCourse classCourse = new ClassCourse();
- classCourse.setClassId(classId);
- classCourseMapper.delete(new QueryWrapper<>(classCourse));
- ClassStudent classStudent = new ClassStudent();
- classStudent.setClassId(classId);
- classStudentMapper.delete(new QueryWrapper<>(classStudent));
- return true;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentClassListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentClassList(StudentClass filter, String orderBy) {
- return studentClassMapper.getStudentClassList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentClassList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentClassListWithRelation(StudentClass filter, String orderBy) {
- List resultList = studentClassMapper.getStudentClassList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 批量添加多对多关联关系。
- *
- * @param classCourseList 多对多关联表对象集合。
- * @param classId 主表Id。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void addClassCourseList(List classCourseList, Long classId) {
- for (ClassCourse classCourse : classCourseList) {
- classCourse.setClassId(classId);
- MyModelUtil.setDefaultValue(classCourse, "courseOrder", 0);
- classCourseMapper.insert(classCourse);
- }
- }
-
- /**
- * 更新中间表数据。
- *
- * @param classCourse 中间表对象。
- * @return 更新成功与否。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean updateClassCourse(ClassCourse classCourse) {
- ClassCourse filter = new ClassCourse();
- filter.setClassId(classCourse.getClassId());
- filter.setCourseId(classCourse.getCourseId());
- UpdateWrapper uw =
- BaseService.createUpdateQueryForNullValue(classCourse, ClassCourse.class);
- uw.setEntity(filter);
- return classCourseMapper.update(classCourse, uw) > 0;
- }
-
- /**
- * 获取中间表数据。
- *
- * @param classId 主表Id。
- * @param courseId 从表Id。
- * @return 中间表对象。
- */
- @Override
- public ClassCourse getClassCourse(Long classId, Long courseId) {
- ClassCourse filter = new ClassCourse();
- filter.setClassId(classId);
- filter.setCourseId(courseId);
- return classCourseMapper.selectOne(new QueryWrapper<>(filter));
- }
-
- /**
- * 移除单条多对多关系。
- *
- * @param classId 主表Id。
- * @param courseId 从表Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean removeClassCourse(Long classId, Long courseId) {
- ClassCourse filter = new ClassCourse();
- filter.setClassId(classId);
- filter.setCourseId(courseId);
- return classCourseMapper.delete(new QueryWrapper<>(filter)) > 0;
- }
-
- /**
- * 批量添加多对多关联关系。
- *
- * @param classStudentList 多对多关联表对象集合。
- * @param classId 主表Id。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void addClassStudentList(List classStudentList, Long classId) {
- for (ClassStudent classStudent : classStudentList) {
- classStudent.setClassId(classId);
- classStudentMapper.insert(classStudent);
- }
- }
-
- /**
- * 移除单条多对多关系。
- *
- * @param classId 主表Id。
- * @param studentId 从表Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean removeClassStudent(Long classId, Long studentId) {
- ClassStudent filter = new ClassStudent();
- filter.setClassId(classId);
- filter.setStudentId(studentId);
- return classStudentMapper.delete(new QueryWrapper<>(filter)) > 0;
- }
-
- /**
- * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
- *
- * @param studentClass 最新数据对象。
- * @param originalStudentClass 原有数据对象。
- * @return 数据全部正确返回true，否则false。
- */
- @Override
- public CallResult verifyRelatedData(StudentClass studentClass, StudentClass originalStudentClass) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- //这里是基于字典的验证。
- if (this.needToVerify(studentClass, originalStudentClass, StudentClass::getSchoolId)
- && !sysDeptService.existId(studentClass.getSchoolId())) {
- return CallResult.error(String.format(errorMessageFormat, "所属校区"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(studentClass, originalStudentClass, StudentClass::getLeaderId)
- && !studentService.existId(studentClass.getLeaderId())) {
- return CallResult.error(String.format(errorMessageFormat, "学生班长"));
- }
- return CallResult.ok();
- }
-
- private StudentClass buildDefaultValue(StudentClass studentClass) {
- studentClass.setClassId(idGenerator.nextLongId());
- TokenData tokenData = TokenData.takeFromRequest();
- studentClass.setCreateUserId(tokenData.getUserId());
- studentClass.setCreateTime(new Date());
- studentClass.setStatus(GlobalDeletedFlag.NORMAL);
- MyModelUtil.setDefaultValue(studentClass, "finishClassHour", 0);
- return studentClass;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java
deleted file mode 100644
index ab9ef203..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/StudentServiceImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package com.orangeforms.webadmin.app.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.*;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.orangeforms.application.common.constant.StudentStatus;
-import com.orangeforms.webadmin.app.service.*;
-import com.orangeforms.webadmin.app.dao.*;
-import com.orangeforms.webadmin.app.model.*;
-import com.orangeforms.webadmin.upms.service.SysDeptService;
-import com.orangeforms.common.core.base.dao.BaseDaoMapper;
-import com.orangeforms.common.core.object.MyRelationParam;
-import com.orangeforms.common.core.object.CallResult;
-import com.orangeforms.common.core.base.service.BaseService;
-import com.orangeforms.common.core.util.MyModelUtil;
-import com.orangeforms.common.sequence.wrapper.IdGeneratorWrapper;
-import com.github.pagehelper.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * 学生数据数据操作服务类。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@Slf4j
-@Service("studentService")
-public class StudentServiceImpl extends BaseService implements StudentService {
-
- @Autowired
- private StudentMapper studentMapper;
- @Autowired
- private ClassStudentMapper classStudentMapper;
- @Autowired
- private AreaCodeService areaCodeService;
- @Autowired
- private GradeService gradeService;
- @Autowired
- private SysDeptService sysDeptService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return studentMapper;
- }
-
- /**
- * 保存新增对象。
- *
- * @param student 新增对象。
- * @return 返回新增对象。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public Student saveNew(Student student) {
- studentMapper.insert(this.buildDefaultValue(student));
- return student;
- }
-
- /**
- * 利用数据库的insertList语法，批量插入对象列表。
- *
- * @param studentList 新增对象列表。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void saveNewBatch(List studentList) {
- if (CollUtil.isNotEmpty(studentList)) {
- studentList.forEach(this::buildDefaultValue);
- studentMapper.insertList(studentList);
- }
- }
-
- /**
- * 更新数据对象。
- *
- * @param student 更新的对象。
- * @param originalStudent 原有数据对象。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean update(Student student, Student originalStudent) {
- student.setRegisterTime(originalStudent.getRegisterTime());
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- UpdateWrapper uw = this.createUpdateQueryForNullValue(student, student.getStudentId());
- return studentMapper.update(student, uw) == 1;
- }
-
- /**
- * 删除指定数据。
- *
- * @param studentId 主键Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public boolean remove(Long studentId) {
- if (studentMapper.deleteById(studentId) == 0) {
- return false;
- }
- // 开始删除多对多父表的关联
- ClassStudent classStudent = new ClassStudent();
- classStudent.setStudentId(studentId);
- classStudentMapper.delete(new QueryWrapper<>(classStudent));
- return true;
- }
-
- /**
- * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
- * 如果需要同时获取关联数据，请移步(getStudentListWithRelation)方法。
- *
- * @param filter 过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentList(Student filter, String orderBy) {
- return studentMapper.getStudentList(filter, orderBy);
- }
-
- /**
- * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
- * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
- * 如果仅仅需要获取主表数据，请移步(getStudentList)，以便获取更好的查询性能。
- *
- * @param filter 主表过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentListWithRelation(Student filter, String orderBy) {
- List resultList = studentMapper.getStudentList(filter, orderBy);
- // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
- // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
- int batchSize = resultList instanceof Page ? 0 : 1000;
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
- return resultList;
- }
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getNotInStudentListByClassId(Long classId, Student filter, String orderBy) {
- List resultList;
- if (classId != null) {
- resultList = studentMapper.getNotInStudentListByClassId(classId, filter, orderBy);
- } else {
- resultList = getStudentList(filter, orderBy);
- }
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
- return resultList;
- }
-
- /**
- * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
- *
- * @param classId 主表主键Id。
- * @param filter 从表的过滤对象。
- * @param orderBy 排序参数。
- * @return 查询结果集。
- */
- @Override
- public List getStudentListByClassId(Long classId, Student filter, String orderBy) {
- List resultList =
- studentMapper.getStudentListByClassId(classId, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
- return resultList;
- }
-
- /**
- * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
- *
- * @param student 最新数据对象。
- * @param originalStudent 原有数据对象。
- * @return 数据全部正确返回true，否则false。
- */
- @Override
- public CallResult verifyRelatedData(Student student, Student originalStudent) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- //这里是基于字典的验证。
- if (this.needToVerify(student, originalStudent, Student::getProvinceId)
- && !areaCodeService.existId(student.getProvinceId())) {
- return CallResult.error(String.format(errorMessageFormat, "所在省份"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(student, originalStudent, Student::getCityId)
- && !areaCodeService.existId(student.getCityId())) {
- return CallResult.error(String.format(errorMessageFormat, "所在城市"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(student, originalStudent, Student::getDistrictId)
- && !areaCodeService.existId(student.getDistrictId())) {
- return CallResult.error(String.format(errorMessageFormat, "所在区县"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(student, originalStudent, Student::getGradeId)
- && !gradeService.existId(student.getGradeId())) {
- return CallResult.error(String.format(errorMessageFormat, "年级"));
- }
- //这里是基于字典的验证。
- if (this.needToVerify(student, originalStudent, Student::getSchoolId)
- && !sysDeptService.existId(student.getSchoolId())) {
- return CallResult.error(String.format(errorMessageFormat, "所属校区"));
- }
- return CallResult.ok();
- }
-
- private Student buildDefaultValue(Student student) {
- student.setStudentId(idGenerator.nextLongId());
- student.setRegisterTime(new Date());
- MyModelUtil.setDefaultValue(student, "totalCoin", 0);
- MyModelUtil.setDefaultValue(student, "leftCoin", 0);
- MyModelUtil.setDefaultValue(student, "status", StudentStatus.NORMAL);
- return student;
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java
deleted file mode 100644
index ae23a9f2..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/CaptchaCacheServiceRedisImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.orangeforms.webadmin.app.util;
-
-import com.anji.captcha.service.CaptchaCacheService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 对于分布式部署的应用，我们建议应用自己实现CaptchaCacheService，比如用Redis，参考service/spring-boot代码示例。
- * 如果应用是单点的，也没有使用redis，那默认使用内存。
- * 内存缓存只适合单节点部署的应用，否则验证码生产与验证在节点之间信息不同步，导致失败。
- *
- * ☆☆☆ SPI： 在resources目录新建META-INF.services文件夹(两层)，参考当前服务resources。
- * @author lide1202@hotmail.com
- * @date 2020-05-12
- */
-public class CaptchaCacheServiceRedisImpl implements CaptchaCacheService {
-
- @Override
- public String type() {
- return "redis";
- }
-
- @Autowired
- private StringRedisTemplate stringRedisTemplate;
-
- @Override
- public void set(String key, String value, long expiresInSeconds) {
- stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
- }
-
- @Override
- public boolean exists(String key) {
- return stringRedisTemplate.hasKey(key);
- }
-
- @Override
- public void delete(String key) {
- stringRedisTemplate.delete(key);
- }
-
- @Override
- public String get(String key) {
- return stringRedisTemplate.opsForValue().get(key);
- }
-
- @Override
- public Long increment(String key, long val) {
- return stringRedisTemplate.opsForValue().increment(key,val);
- }
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
deleted file mode 100644
index e23c529e..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 行政区划DomainVO对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("行政区划实体对象")
-@Data
-public class AreaCodeVo {
-
- /**
- * 行政区划主键Id
- */
- @ApiModelProperty(value = "行政区划主键Id", required = true)
- private Long areaId;
-
- /**
- * 行政区划名称
- */
- @ApiModelProperty(value = "行政区划名称")
- private String areaName;
-
- /**
- * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
- */
- @ApiModelProperty(value = "行政区划级别")
- private Integer areaLevel;
-
- /**
- * 父级行政区划Id
- */
- @ApiModelProperty(value = "父级行政区划Id")
- private Long parentId;
-}
\ No newline at end of file
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java
deleted file mode 100644
index f0d5a7f2..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassCourseVo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * ClassCourseVO视图对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("ClassCourseVO视图对象")
-@Data
-public class ClassCourseVo {
-
- /**
- * 班级Id。
- */
- @ApiModelProperty(value = "班级Id")
- private Long classId;
-
- /**
- * 课程Id。
- */
- @ApiModelProperty(value = "课程Id")
- private Long courseId;
-
- /**
- * 课程顺序(数值越小越靠前)。
- */
- @ApiModelProperty(value = "课程顺序(数值越小越靠前)")
- private Integer courseOrder;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java
deleted file mode 100644
index bd553ca1..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/ClassStudentVo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * ClassStudentVO视图对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("ClassStudentVO视图对象")
-@Data
-public class ClassStudentVo {
-
- /**
- * 班级Id。
- */
- @ApiModelProperty(value = "班级Id")
- private Long classId;
-
- /**
- * 学生Id。
- */
- @ApiModelProperty(value = "学生Id")
- private Long studentId;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java
deleted file mode 100644
index 7c6a61e3..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseTransStatsVo.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * CourseTransStatsVO视图对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("CourseTransStatsVO视图对象")
-@Data
-public class CourseTransStatsVo {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id")
- private Long statsId;
-
- /**
- * 统计日期。
- */
- @ApiModelProperty(value = "统计日期")
- private Date statsDate;
-
- /**
- * 科目Id。
- */
- @ApiModelProperty(value = "科目Id")
- private Integer subjectId;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id")
- private Integer gradeId;
-
- /**
- * 年级名称。
- */
- @ApiModelProperty(value = "年级名称")
- private String gradeName;
-
- /**
- * 课程Id。
- */
- @ApiModelProperty(value = "课程Id")
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @ApiModelProperty(value = "课程名称")
- private String courseName;
-
- /**
- * 学生上课次数。
- */
- @ApiModelProperty(value = "学生上课次数")
- private Integer studentAttendCount;
-
- /**
- * 学生献花数量。
- */
- @ApiModelProperty(value = "学生献花数量")
- private Integer studentFlowerAmount;
-
- /**
- * 学生献花次数。
- */
- @ApiModelProperty(value = "学生献花次数")
- private Integer studentFlowerCount;
-
- /**
- * gradeId 字典关联数据。
- */
- @ApiModelProperty(value = "gradeId 字典关联数据")
- private Map gradeIdDictMap;
-
- /**
- * subjectId 常量字典关联数据。
- */
- @ApiModelProperty(value = "subjectId 常量字典关联数据")
- private Map subjectIdDictMap;
-}
diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java
deleted file mode 100644
index e39d8432..00000000
--- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/CourseVo.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.orangeforms.webadmin.app.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * CourseVO视图对象。
- *
- * @author Jerry
- * @date 2020-09-24
- */
-@ApiModel("CourseVO视图对象")
-@Data
-public class CourseVo {
-
- /**
- * 主键Id。
- */
- @ApiModelProperty(value = "主键Id")
- private Long courseId;
-
- /**
- * 课程名称。
- */
- @ApiModelProperty(value = "课程名称")
- private String courseName;
-
- /**
- * 课程价格。
- */
- @ApiModelProperty(value = "课程价格")
- private BigDecimal price;
-
- /**
- * 课程描述。
- */
- @ApiModelProperty(value = "课程描述")
- private String description;
-
- /**
- * 课程难度(0: 容易 1: 普通 2: 很难)。
- */
- @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)")
- private Integer difficulty;
-
- /**
- * 年级Id。
- */
- @ApiModelProperty(value = "年级Id")
- private Integer gradeId;
-
- /**
- * 学科Id。
- */
- @ApiModelProperty(value = "学科Id")
- private Integer subjectId;
-
- /**
- * 课时数量。
- */
- @ApiModelProperty(value = "课时数量")
- private Integer classHour;
-
- /**
- * 多张课程图片地址。
- */
- @ApiModelProperty(value = "多张课程图片地址")
- private String pictureUrl;
-
- /**
- * 创建用户Id。
- */
- @ApiModelProperty(value = "创建用户Id")
- private Long createUserId;
-
- /**
- * 创建时间。
- */
- @ApiModelProperty(value = "创建时间")
- private Date createTime;
-
- /**
- * 最后修改时间。
- */
- @ApiModelProperty(value = "最后修改时间")
- private Date updateTime;
-
- /**
- * courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo。
- */
- @ApiModelProperty(value = "courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo")
- private Map classCourse;
-
- /**
- * gradeId 字典关联数据。
- */
- @ApiModelProperty(value = "gradeId 字典关联数据")
- private Map