From 1d21b22481a0f50a40519f114df084a15f2151a5 Mon Sep 17 00:00:00 2001 From: liaowei <532810027@qq.com> Date: Sun, 1 Sep 2024 13:07:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 46 + LICENSE | 21 + README.md | 1 + bin/clean.bat | 12 + bin/package.bat | 12 + bin/run-auth.bat | 14 + bin/run-gateway.bat | 14 + bin/run-modules-file.bat | 14 + bin/run-modules-gen.bat | 14 + bin/run-modules-job.bat | 14 + bin/run-modules-system.bat | 14 + bin/run-monitor.bat | 14 + docker/copy.sh | 41 + docker/deploy.sh | 67 + docker/docker-compose.yml | 140 ++ docker/mysql/db/readme.txt | 1 + docker/mysql/dockerfile | 7 + docker/nacos/conf/application.properties | 32 + docker/nacos/dockerfile | 7 + docker/nginx/conf/nginx.conf | 41 + docker/nginx/dockerfile | 15 + docker/redis/conf/redis.conf | 1 + docker/redis/dockerfile | 13 + docker/ruoyi/auth/dockerfile | 15 + docker/ruoyi/auth/jar/readme.txt | 1 + docker/ruoyi/gateway/dockerfile | 15 + docker/ruoyi/gateway/jar/readme.txt | 1 + docker/ruoyi/modules/file/dockerfile | 15 + docker/ruoyi/modules/file/jar/readme.txt | 1 + docker/ruoyi/modules/gen/dockerfile | 15 + docker/ruoyi/modules/gen/jar/readme.txt | 1 + docker/ruoyi/modules/job/dockerfile | 15 + docker/ruoyi/modules/job/jar/readme.txt | 1 + docker/ruoyi/modules/system/dockerfile | 15 + docker/ruoyi/modules/system/jar/readme.txt | 1 + docker/ruoyi/visual/monitor/dockerfile | 15 + docker/ruoyi/visual/monitor/jar/readme.txt | 1 + pom.xml | 318 ++++ sql/quartz.sql | 174 ++ sql/ry_20240629.sql | 697 ++++++++ sql/ry_config_20231204.sql | 219 +++ sql/ry_seata_20210128.sql | 80 + zeroerroa-api/pom.xml | 22 + zeroerroa-api/zeroerroa-api-system/pom.xml | 28 + .../zeroerr/system/api/RemoteFileService.java | 29 + .../zeroerr/system/api/RemoteLogService.java | 41 + .../zeroerr/system/api/RemoteUserService.java | 59 + .../system/api/domain/RecruitStructure.java | 256 +++ .../zeroerr/system/api/domain/SysDept.java | 203 +++ .../system/api/domain/SysDictData.java | 176 ++ .../system/api/domain/SysDictType.java | 96 + .../zeroerr/system/api/domain/SysFile.java | 50 + .../system/api/domain/SysLogininfor.java | 102 ++ .../zeroerr/system/api/domain/SysOperLog.java | 255 +++ .../zeroerr/system/api/domain/SysRole.java | 241 +++ .../zeroerr/system/api/domain/SysUser.java | 323 ++++ .../factory/RemoteFileFallbackFactory.java | 35 + .../api/factory/RemoteLogFallbackFactory.java | 42 + .../factory/RemoteUserFallbackFactory.java | 47 + .../zeroerr/system/api/model/LoginUser.java | 163 ++ ...ot.autoconfigure.AutoConfiguration.imports | 3 + zeroerroa-auth/pom.xml | 74 + .../zeroerr/auth/ZeroErrAuthApplication.java | 31 + .../auth/controller/TokenController.java | 78 + .../java/com/zeroerr/auth/form/LoginBody.java | 39 + .../com/zeroerr/auth/form/RegisterBody.java | 11 + .../zeroerr/auth/service/SysLoginService.java | 161 ++ .../auth/service/SysPasswordService.java | 85 + .../auth/service/SysRecordLogService.java | 48 + zeroerroa-auth/src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + zeroerroa-auth/src/main/resources/logback.xml | 74 + zeroerroa-common/pom.xml | 30 + .../zeroerroa-common-core/pom.xml | 131 ++ .../zeroerr/common/core/annotation/Excel.java | 187 ++ .../common/core/annotation/Excels.java | 18 + .../common/core/config/MybatisPlusConfig.java | 63 + .../common/core/constant/CacheConstants.java | 59 + .../common/core/constant/Constants.java | 135 ++ .../common/core/constant/GenConstants.java | 117 ++ .../common/core/constant/HttpStatus.java | 94 + .../core/constant/ScheduleConstants.java | 50 + .../core/constant/SecurityConstants.java | 49 + .../core/constant/ServiceNameConstants.java | 24 + .../common/core/constant/TokenConstants.java | 25 + .../common/core/constant/UserConstants.java | 80 + .../core/context/SecurityContextHolder.java | 98 ++ .../com/zeroerr/common/core/domain/R.java | 115 ++ .../common/core/enums/ProcessAction.java | 41 + .../common/core/enums/ProcessResult.java | 36 + .../core/enums/ProcessTaskNodeStatus.java | 36 + .../common/core/enums/ProcessTaskStatus.java | 42 + .../common/core/enums/RecruitEnum.java | 40 + .../zeroerr/common/core/enums/UserStatus.java | 30 + .../core/exception/CaptchaException.java | 16 + .../core/exception/CheckedException.java | 31 + .../core/exception/DemoModeException.java | 15 + .../core/exception/GlobalException.java | 58 + .../core/exception/InnerAuthException.java | 16 + .../core/exception/PreAuthorizeException.java | 15 + .../core/exception/ServiceException.java | 74 + .../common/core/exception/UtilException.java | 26 + .../exception/auth/NotLoginException.java | 16 + .../auth/NotPermissionException.java | 23 + .../core/exception/auth/NotRoleException.java | 23 + .../core/exception/base/BaseException.java | 79 + .../core/exception/file/FileException.java | 19 + .../FileNameLengthLimitExceededException.java | 16 + .../file/FileSizeLimitExceededException.java | 16 + .../exception/file/FileUploadException.java | 61 + .../file/InvalidExtensionException.java | 80 + .../core/exception/job/TaskException.java | 34 + .../user/CaptchaExpireException.java | 16 + .../core/exception/user/UserException.java | 18 + .../user/UserPasswordNotMatchException.java | 16 + .../zeroerr/common/core/text/CharsetKit.java | 86 + .../com/zeroerr/common/core/text/Convert.java | 1016 +++++++++++ .../common/core/text/StrFormatter.java | 92 + .../zeroerr/common/core/utils/DateUtils.java | 183 ++ .../common/core/utils/ExceptionUtil.java | 39 + .../zeroerr/common/core/utils/JwtUtils.java | 123 ++ .../zeroerr/common/core/utils/PageUtils.java | 35 + .../common/core/utils/ServletUtils.java | 333 ++++ .../common/core/utils/SpringUtils.java | 114 ++ .../common/core/utils/StringUtils.java | 607 +++++++ .../common/core/utils/bean/BeanUtils.java | 110 ++ .../core/utils/bean/BeanValidators.java | 24 + .../common/core/utils/file/FileTypeUtils.java | 95 + .../common/core/utils/file/FileUtils.java | 253 +++ .../common/core/utils/file/ImageUtils.java | 84 + .../common/core/utils/file/MimeTypeUtils.java | 59 + .../common/core/utils/html/EscapeUtil.java | 167 ++ .../common/core/utils/html/HTMLFilter.java | 570 ++++++ .../zeroerr/common/core/utils/ip/IpUtils.java | 382 ++++ .../core/utils/poi/ExcelHandlerAdapter.java | 24 + .../common/core/utils/poi/ExcelUtil.java | 1539 +++++++++++++++++ .../core/utils/reflect/ReflectUtils.java | 410 +++++ .../common/core/utils/sign/Base64.java | 291 ++++ .../common/core/utils/sql/SqlUtil.java | 70 + .../common/core/utils/uuid/IdUtils.java | 49 + .../zeroerr/common/core/utils/uuid/Seq.java | 86 + .../zeroerr/common/core/utils/uuid/UUID.java | 484 ++++++ .../core/web/controller/BaseController.java | 142 ++ .../common/core/web/domain/AjaxResult.java | 216 +++ .../common/core/web/domain/BaseEntity.java | 118 ++ .../common/core/web/domain/TreeEntity.java | 79 + .../common/core/web/page/PageDomain.java | 101 ++ .../common/core/web/page/TableDataInfo.java | 85 + .../common/core/web/page/TableSupport.java | 56 + .../java/com/zeroerr/common/core/xss/Xss.java | 27 + .../zeroerr/common/core/xss/XssValidator.java | 39 + ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../zeroerroa-common-datascope/pom.xml | 27 + .../datascope/annotation/DataScope.java | 33 + .../datascope/aspect/DataScopeAspect.java | 184 ++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../zeroerroa-common-datasource/pom.xml | 35 + .../common/datasource/annotation/Master.java | 22 + .../common/datasource/annotation/Slave.java | 22 + zeroerroa-common/zeroerroa-common-log/pom.xml | 27 + .../zeroerr/common/log/annotation/Log.java | 51 + .../zeroerr/common/log/aspect/LogAspect.java | 249 +++ .../common/log/enums/BusinessStatus.java | 20 + .../common/log/enums/BusinessType.java | 59 + .../common/log/enums/OperatorType.java | 24 + .../log/filter/PropertyPreExcludeFilter.java | 24 + .../common/log/service/AsyncLogService.java | 29 + ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../zeroerroa-common-redis/pom.xml | 33 + .../FastJson2JsonRedisSerializer.java | 52 + .../common/redis/configure/RedisConfig.java | 43 + .../common/redis/service/RedisService.java | 268 +++ ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../zeroerroa-common-seata/pom.xml | 27 + .../zeroerroa-common-security/pom.xml | 39 + .../annotation/EnableCustomConfig.java | 31 + .../annotation/EnableRyFeignClients.java | 27 + .../common/security/annotation/InnerAuth.java | 19 + .../common/security/annotation/Logical.java | 20 + .../security/annotation/RequiresLogin.java | 18 + .../annotation/RequiresPermissions.java | 27 + .../security/annotation/RequiresRoles.java | 26 + .../security/aspect/InnerAuthAspect.java | 51 + .../security/aspect/PreAuthorizeAspect.java | 97 ++ .../common/security/auth/AuthLogic.java | 373 ++++ .../common/security/auth/AuthUtil.java | 167 ++ .../security/config/ApplicationConfig.java | 22 + .../common/security/config/WebMvcConfig.java | 33 + .../feign/FeignAutoConfiguration.java | 20 + .../feign/FeignRequestInterceptor.java | 54 + .../handler/GlobalExceptionHandler.java | 166 ++ .../interceptor/HeaderInterceptor.java | 54 + .../common/security/service/TokenService.java | 174 ++ .../common/security/utils/DictUtils.java | 75 + .../common/security/utils/SecurityUtils.java | 117 ++ ...ot.autoconfigure.AutoConfiguration.imports | 5 + .../zeroerroa-common-sensitive/pom.xml | 27 + .../sensitive/annotation/Sensitive.java | 24 + .../config/SensitiveJsonSerializer.java | 67 + .../sensitive/enums/DesensitizedType.java | 59 + .../sensitive/utils/DesensitizedUtil.java | 51 + .../zeroerroa-common-swagger/pom.xml | 34 + .../annotation/EnableCustomSwagger2.java | 20 + .../config/SwaggerAutoConfiguration.java | 123 ++ .../config/SwaggerBeanPostProcessor.java | 52 + .../swagger/config/SwaggerProperties.java | 343 ++++ .../config/SwaggerWebConfiguration.java | 20 + ...ot.autoconfigure.AutoConfiguration.imports | 3 + zeroerroa-gateway/.drone.yml | 60 + zeroerroa-gateway/Dockerfile | 23 + zeroerroa-gateway/docker.sh | 21 + zeroerroa-gateway/pom.xml | 110 ++ .../gateway/ZeroErrGatewayApplication.java | 29 + .../zeroerr/gateway/config/CaptchaConfig.java | 83 + .../zeroerr/gateway/config/GatewayConfig.java | 23 + .../gateway/config/KaptchaTextCreator.java | 75 + .../config/RouterFunctionConfiguration.java | 31 + .../gateway/config/SwaggerProvider.java | 79 + .../config/properties/CaptchaProperties.java | 46 + .../properties/IgnoreWhiteProperties.java | 33 + .../config/properties/XssProperties.java | 48 + .../zeroerr/gateway/filter/AuthFilter.java | 135 ++ .../gateway/filter/BlackListUrlFilter.java | 65 + .../gateway/filter/CacheRequestFilter.java | 87 + .../gateway/filter/ValidateCodeFilter.java | 79 + .../com/zeroerr/gateway/filter/XssFilter.java | 129 ++ .../handler/GatewayExceptionHandler.java | 56 + .../handler/SentinelFallbackHandler.java | 41 + .../gateway/handler/SwaggerHandler.java | 56 + .../gateway/handler/ValidateCodeHandler.java | 41 + .../gateway/service/ValidateCodeService.java | 23 + .../service/impl/ValidateCodeServiceImpl.java | 118 ++ .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 44 + .../src/main/resources/logback.xml | 74 + zeroerroa-gateway/start.sh | 8 + zeroerroa-modules/pom.xml | 26 + zeroerroa-modules/zeroerroa-file/pom.xml | 88 + .../zeroerr/file/ZeroErrFileApplication.java | 31 + .../com/zeroerr/file/config/MinioConfig.java | 82 + .../zeroerr/file/config/ResourcesConfig.java | 50 + .../com/zeroerr/file/config/RuoYiConfig.java | 122 ++ .../file/controller/SysFileController.java | 48 + .../service/FastDfsSysFileServiceImpl.java | 46 + .../zeroerr/file/service/ISysFileService.java | 20 + .../file/service/LocalSysFileServiceImpl.java | 50 + .../file/service/MinioSysFileServiceImpl.java | 49 + .../zeroerr/file/utils/FileUploadUtils.java | 185 ++ .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + zeroerroa-modules/zeroerroa-gen/pom.xml | 94 + .../zeroerr/gen/ZeroErrGenApplication.java | 34 + .../com/zeroerr/gen/config/GenConfig.java | 66 + .../zeroerr/gen/controller/GenController.java | 211 +++ .../java/com/zeroerr/gen/domain/GenTable.java | 383 ++++ .../zeroerr/gen/domain/GenTableColumn.java | 374 ++++ .../gen/mapper/GenTableColumnMapper.java | 62 + .../zeroerr/gen/mapper/GenTableMapper.java | 85 + .../service/GenTableColumnServiceImpl.java | 68 + .../gen/service/GenTableServiceImpl.java | 521 ++++++ .../gen/service/IGenTableColumnService.java | 44 + .../zeroerr/gen/service/IGenTableService.java | 121 ++ .../java/com/zeroerr/gen/util/GenUtils.java | 257 +++ .../zeroerr/gen/util/VelocityInitializer.java | 34 + .../com/zeroerr/gen/util/VelocityUtils.java | 408 +++++ .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + .../mapper/generator/GenTableColumnMapper.xml | 127 ++ .../mapper/generator/GenTableMapper.xml | 206 +++ .../main/resources/vm/java/controller.java.vm | 116 ++ .../src/main/resources/vm/java/domain.java.vm | 105 ++ .../src/main/resources/vm/java/mapper.java.vm | 91 + .../main/resources/vm/java/service.java.vm | 61 + .../resources/vm/java/serviceImpl.java.vm | 169 ++ .../main/resources/vm/java/sub-domain.java.vm | 76 + .../src/main/resources/vm/js/api.js.vm | 44 + .../src/main/resources/vm/sql/sql.vm | 22 + .../main/resources/vm/vue/index-tree.vue.vm | 505 ++++++ .../src/main/resources/vm/vue/index.vue.vm | 602 +++++++ .../resources/vm/vue/v3/index-tree.vue.vm | 474 +++++ .../src/main/resources/vm/vue/v3/index.vue.vm | 590 +++++++ .../src/main/resources/vm/xml/mapper.xml.vm | 140 ++ zeroerroa-modules/zeroerroa-job/pom.xml | 100 ++ .../zeroerr/job/ZeroErrJobApplication.java | 34 + .../zeroerr/job/config/ScheduleConfig.java | 57 + .../job/controller/SysJobController.java | 186 ++ .../job/controller/SysJobLogController.java | 91 + .../java/com/zeroerr/job/domain/SysJob.java | 171 ++ .../com/zeroerr/job/domain/SysJobLog.java | 155 ++ .../zeroerr/job/mapper/SysJobLogMapper.java | 66 + .../com/zeroerr/job/mapper/SysJobMapper.java | 69 + .../job/service/ISysJobLogService.java | 56 + .../zeroerr/job/service/ISysJobService.java | 102 ++ .../job/service/SysJobLogServiceImpl.java | 86 + .../job/service/SysJobServiceImpl.java | 260 +++ .../java/com/zeroerr/job/task/RyTask.java | 28 + .../zeroerr/job/util/AbstractQuartzJob.java | 106 ++ .../java/com/zeroerr/job/util/CronUtils.java | 63 + .../com/zeroerr/job/util/JobInvokeUtil.java | 182 ++ .../QuartzDisallowConcurrentExecution.java | 22 + .../zeroerr/job/util/QuartzJobExecution.java | 20 + .../com/zeroerr/job/util/ScheduleUtils.java | 141 ++ .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + .../resources/mapper/job/SysJobLogMapper.xml | 94 + .../resources/mapper/job/SysJobMapper.xml | 111 ++ zeroerroa-modules/zeroerroa-recruit/pom.xml | 112 ++ .../recruit/ZeroErrRecruitApplication.java | 34 + .../controller/EntryManageController.java | 162 ++ .../controller/HomePageController.java | 897 ++++++++++ .../controller/RecruitFollowController.java | 609 +++++++ .../RecruitInterviewController.java | 350 ++++ .../RecruitPostGradeController.java | 115 ++ .../controller/RecruitProcessController.java | 627 +++++++ .../RecruitStructureController.java | 158 ++ .../recruit/domain/dto/AnnouncementDTO.java | 84 + .../recruit/domain/dto/EntryManagerDTO.java | 50 + .../zeroerr/recruit/domain/dto/FollowDTO.java | 39 + .../recruit/domain/dto/HomePageDTO.java | 22 + .../recruit/domain/dto/PostDetailDTO.java | 18 + .../recruit/domain/dto/PostStatusDTO.java | 15 + .../recruit/domain/dto/RecordListDTO.java | 29 + .../recruit/domain/dto/ToppingDTO.java | 15 + .../recruit/domain/entity/EntryManage.java | 162 ++ .../recruit/domain/entity/InterviewTag.java | 38 + .../recruit/domain/entity/PostGrade.java | 125 ++ .../recruit/domain/entity/PostPlanFollow.java | 221 +++ .../recruit/domain/entity/RecruitPost.java | 91 + .../domain/entity/RecruitProcessTask.java | 267 +++ .../domain/entity/RecruitProcessTaskNode.java | 100 ++ .../domain/entity/ResumeFollowRecord.java | 370 ++++ .../domain/entity/ResumeHandleRecord.java | 111 ++ .../recruit/domain/vo/AnnouncementVO.java | 54 + .../recruit/domain/vo/ApprovedResultVO.java | 21 + .../recruit/domain/vo/EditRecortVO.java | 22 + .../recruit/domain/vo/EntryStatisticsVO.java | 20 + .../zeroerr/recruit/domain/vo/FollowVO.java | 141 ++ .../recruit/domain/vo/InterViewTagVO.java | 21 + .../zeroerr/recruit/domain/vo/PostListVO.java | 18 + .../recruit/domain/vo/ResumeStatVO.java | 120 ++ .../recruit/domain/vo/StructureMapVO.java | 16 + .../recruit/domain/vo/StructurePostVO.java | 14 + .../recruit/domain/vo/StructureVO.java | 14 + .../com/zeroerr/recruit/domain/vo/UserVO.java | 16 + .../recruit/mapper/EntryManageMapper.java | 35 + .../recruit/mapper/InterviewTagMapper.java | 21 + .../recruit/mapper/PostGradeMapper.java | 24 + .../recruit/mapper/PostPlanFollowMapper.java | 25 + .../recruit/mapper/RecruitPostMapper.java | 30 + .../mapper/RecruitProcessTaskMapper.java | 53 + .../mapper/RecruitProcessTaskNodeMapper.java | 33 + .../mapper/ResumeFollowRecordMapper.java | 44 + .../mapper/ResumeHandleRecordMapper.java | 31 + .../recruit/service/EntryManageService.java | 28 + .../recruit/service/InterviewTagService.java | 14 + .../recruit/service/PostGradeService.java | 19 + .../service/PostPlanFollowService.java | 19 + .../recruit/service/RecruitPostService.java | 26 + .../RecruitProcessTaskNodeService.java | 26 + .../service/RecruitProcessTaskService.java | 50 + .../service/ResumeFollowRecordService.java | 38 + .../service/ResumeHandleRecordService.java | 27 + .../service/impl/EntryManageServiceImpl.java | 50 + .../service/impl/InterviewTagServiceImpl.java | 22 + .../service/impl/PostGradeServiceImpl.java | 34 + .../impl/PostPlanFollowServiceImpl.java | 35 + .../service/impl/RecruitPostServiceImpl.java | 68 + .../RecruitProcessTaskNodeServiceImpl.java | 50 + .../impl/RecruitProcessTaskServiceImpl.java | 195 +++ .../impl/ResumeFollowRecordServiceImpl.java | 82 + .../impl/ResumeHandleRecordServiceImpl.java | 45 + .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + .../mapper.recruit/EntryManageMapper.xml | 92 + .../mapper.recruit/InterviewTagMapper.xml | 16 + .../mapper.recruit/PostGradeMapper.xml | 62 + .../mapper.recruit/PostPlanFollowMapper.xml | 66 + .../mapper.recruit/RecruitPostMapper.xml | 51 + .../RecruitProcessTaskMapper.xml | 285 +++ .../RecruitProcessTaskNodeMapper.xml | 44 + .../ResumeFollowRecordMapper.xml | 242 +++ .../ResumeHandleRecordMapper.xml | 64 + zeroerroa-modules/zeroerroa-system/pom.xml | 100 ++ .../system/ZeroErrSystemApplication.java | 34 + .../controller/SysConfigController.java | 133 ++ .../system/controller/SysDeptController.java | 133 ++ .../controller/SysDictDataController.java | 122 ++ .../controller/SysDictTypeController.java | 132 ++ .../controller/SysLogininforController.java | 92 + .../system/controller/SysMenuController.java | 159 ++ .../controller/SysNoticeController.java | 92 + .../controller/SysOperlogController.java | 78 + .../system/controller/SysPostController.java | 130 ++ .../controller/SysProfileController.java | 154 ++ .../system/controller/SysRoleController.java | 239 +++ .../system/controller/SysUserController.java | 341 ++++ .../controller/SysUserOnlineController.java | 83 + .../com/zeroerr/system/domain/SysConfig.java | 111 ++ .../com/zeroerr/system/domain/SysMenu.java | 274 +++ .../com/zeroerr/system/domain/SysNotice.java | 102 ++ .../com/zeroerr/system/domain/SysPost.java | 124 ++ .../zeroerr/system/domain/SysRoleDept.java | 46 + .../zeroerr/system/domain/SysRoleMenu.java | 46 + .../zeroerr/system/domain/SysUserOnline.java | 100 ++ .../zeroerr/system/domain/SysUserPost.java | 46 + .../zeroerr/system/domain/SysUserRole.java | 46 + .../com/zeroerr/system/domain/vo/MetaVo.java | 106 ++ .../zeroerr/system/domain/vo/RouterVo.java | 148 ++ .../zeroerr/system/domain/vo/TreeSelect.java | 83 + .../system/mapper/RecruitStructureMapper.java | 65 + .../system/mapper/SysConfigMapper.java | 78 + .../zeroerr/system/mapper/SysDeptMapper.java | 120 ++ .../system/mapper/SysDictDataMapper.java | 99 ++ .../system/mapper/SysDictTypeMapper.java | 85 + .../system/mapper/SysLogininforMapper.java | 44 + .../zeroerr/system/mapper/SysMenuMapper.java | 127 ++ .../system/mapper/SysNoticeMapper.java | 62 + .../system/mapper/SysOperLogMapper.java | 50 + .../zeroerr/system/mapper/SysPostMapper.java | 101 ++ .../system/mapper/SysRoleDeptMapper.java | 46 + .../zeroerr/system/mapper/SysRoleMapper.java | 115 ++ .../system/mapper/SysRoleMenuMapper.java | 46 + .../zeroerr/system/mapper/SysUserMapper.java | 139 ++ .../system/mapper/SysUserPostMapper.java | 46 + .../system/mapper/SysUserRoleMapper.java | 64 + .../system/service/ISysConfigService.java | 83 + .../system/service/ISysDeptService.java | 125 ++ .../system/service/ISysDictDataService.java | 63 + .../system/service/ISysDictTypeService.java | 99 ++ .../system/service/ISysLogininforService.java | 41 + .../system/service/ISysMenuService.java | 145 ++ .../system/service/ISysNoticeService.java | 61 + .../system/service/ISysOperLogService.java | 50 + .../system/service/ISysPermissionService.java | 28 + .../system/service/ISysPostService.java | 100 ++ .../system/service/ISysRoleService.java | 178 ++ .../system/service/ISysUserOnlineService.java | 49 + .../system/service/ISysUserService.java | 217 +++ .../service/RecruitStructureService.java | 57 + .../impl/RecruitStructureServiceImpl.java | 296 ++++ .../service/impl/SysConfigServiceImpl.java | 213 +++ .../service/impl/SysDeptServiceImpl.java | 338 ++++ .../service/impl/SysDictDataServiceImpl.java | 116 ++ .../service/impl/SysDictTypeServiceImpl.java | 223 +++ .../impl/SysLogininforServiceImpl.java | 65 + .../service/impl/SysMenuServiceImpl.java | 543 ++++++ .../service/impl/SysNoticeServiceImpl.java | 92 + .../service/impl/SysOperLogServiceImpl.java | 77 + .../impl/SysPermissionServiceImpl.java | 86 + .../service/impl/SysPostServiceImpl.java | 178 ++ .../service/impl/SysRoleServiceImpl.java | 437 +++++ .../impl/SysUserOnlineServiceImpl.java | 89 + .../service/impl/SysUserServiceImpl.java | 581 +++++++ .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + .../mapper/system/RecruitStructureMapper.xml | 354 ++++ .../mapper/system/SysConfigMapper.xml | 117 ++ .../resources/mapper/system/SysDeptMapper.xml | 157 ++ .../mapper/system/SysDictDataMapper.xml | 131 ++ .../mapper/system/SysDictTypeMapper.xml | 105 ++ .../mapper/system/SysLogininforMapper.xml | 54 + .../resources/mapper/system/SysMenuMapper.xml | 206 +++ .../mapper/system/SysNoticeMapper.xml | 89 + .../mapper/system/SysOperLogMapper.xml | 86 + .../resources/mapper/system/SysPostMapper.xml | 122 ++ .../mapper/system/SysRoleDeptMapper.xml | 34 + .../resources/mapper/system/SysRoleMapper.xml | 165 ++ .../mapper/system/SysRoleMenuMapper.xml | 34 + .../resources/mapper/system/SysUserMapper.xml | 245 +++ .../mapper/system/SysUserPostMapper.xml | 34 + .../mapper/system/SysUserRoleMapper.xml | 44 + zeroerroa-visual/pom.xml | 22 + zeroerroa-visual/zeroerroa-monitor/pom.xml | 75 + .../monitor/RuoYiMonitorApplication.java | 30 + .../monitor/config/WebSecurityConfigurer.java | 51 + .../src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 29 + .../src/main/resources/logback.xml | 74 + 483 files changed, 49059 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 bin/clean.bat create mode 100644 bin/package.bat create mode 100644 bin/run-auth.bat create mode 100644 bin/run-gateway.bat create mode 100644 bin/run-modules-file.bat create mode 100644 bin/run-modules-gen.bat create mode 100644 bin/run-modules-job.bat create mode 100644 bin/run-modules-system.bat create mode 100644 bin/run-monitor.bat create mode 100644 docker/copy.sh create mode 100644 docker/deploy.sh create mode 100644 docker/docker-compose.yml create mode 100644 docker/mysql/db/readme.txt create mode 100644 docker/mysql/dockerfile create mode 100644 docker/nacos/conf/application.properties create mode 100644 docker/nacos/dockerfile create mode 100644 docker/nginx/conf/nginx.conf create mode 100644 docker/nginx/dockerfile create mode 100644 docker/redis/conf/redis.conf create mode 100644 docker/redis/dockerfile create mode 100644 docker/ruoyi/auth/dockerfile create mode 100644 docker/ruoyi/auth/jar/readme.txt create mode 100644 docker/ruoyi/gateway/dockerfile create mode 100644 docker/ruoyi/gateway/jar/readme.txt create mode 100644 docker/ruoyi/modules/file/dockerfile create mode 100644 docker/ruoyi/modules/file/jar/readme.txt create mode 100644 docker/ruoyi/modules/gen/dockerfile create mode 100644 docker/ruoyi/modules/gen/jar/readme.txt create mode 100644 docker/ruoyi/modules/job/dockerfile create mode 100644 docker/ruoyi/modules/job/jar/readme.txt create mode 100644 docker/ruoyi/modules/system/dockerfile create mode 100644 docker/ruoyi/modules/system/jar/readme.txt create mode 100644 docker/ruoyi/visual/monitor/dockerfile create mode 100644 docker/ruoyi/visual/monitor/jar/readme.txt create mode 100644 pom.xml create mode 100644 sql/quartz.sql create mode 100644 sql/ry_20240629.sql create mode 100644 sql/ry_config_20231204.sql create mode 100644 sql/ry_seata_20210128.sql create mode 100644 zeroerroa-api/pom.xml create mode 100644 zeroerroa-api/zeroerroa-api-system/pom.xml create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteFileService.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteLogService.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/RecruitStructure.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDept.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictData.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictType.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysFile.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysLogininfor.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysOperLog.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysRole.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysUser.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteFileFallbackFactory.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteLogFallbackFactory.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteUserFallbackFactory.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/model/LoginUser.java create mode 100644 zeroerroa-api/zeroerroa-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-auth/pom.xml create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/ZeroErrAuthApplication.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/controller/TokenController.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/form/LoginBody.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/form/RegisterBody.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysLoginService.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysPasswordService.java create mode 100644 zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysRecordLogService.java create mode 100644 zeroerroa-auth/src/main/resources/banner.txt create mode 100644 zeroerroa-auth/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-auth/src/main/resources/logback.xml create mode 100644 zeroerroa-common/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-core/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excel.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excels.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/config/MybatisPlusConfig.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/CacheConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/Constants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/GenConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/HttpStatus.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ScheduleConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/SecurityConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ServiceNameConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/TokenConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/UserConstants.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/context/SecurityContextHolder.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/domain/R.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessAction.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessResult.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskNodeStatus.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskStatus.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/RecruitEnum.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/UserStatus.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CaptchaException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CheckedException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/DemoModeException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/GlobalException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/InnerAuthException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/PreAuthorizeException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/ServiceException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/UtilException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotLoginException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotPermissionException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotRoleException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/base/BaseException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileNameLengthLimitExceededException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileSizeLimitExceededException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileUploadException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/InvalidExtensionException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/job/TaskException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/CaptchaExpireException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserPasswordNotMatchException.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/CharsetKit.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/Convert.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/StrFormatter.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/DateUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ExceptionUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/JwtUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/PageUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ServletUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/SpringUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/StringUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanValidators.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileTypeUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/ImageUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/MimeTypeUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/EscapeUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/HTMLFilter.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ip/IpUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelHandlerAdapter.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/reflect/ReflectUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sign/Base64.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sql/SqlUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/IdUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/Seq.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/UUID.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/controller/BaseController.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/AjaxResult.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/BaseEntity.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/TreeEntity.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/PageDomain.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableDataInfo.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableSupport.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/Xss.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/XssValidator.java create mode 100644 zeroerroa-common/zeroerroa-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-common/zeroerroa-common-datascope/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/annotation/DataScope.java create mode 100644 zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/aspect/DataScopeAspect.java create mode 100644 zeroerroa-common/zeroerroa-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-common/zeroerroa-common-datasource/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Master.java create mode 100644 zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Slave.java create mode 100644 zeroerroa-common/zeroerroa-common-log/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/annotation/Log.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/aspect/LogAspect.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessStatus.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessType.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/OperatorType.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/filter/PropertyPreExcludeFilter.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/service/AsyncLogService.java create mode 100644 zeroerroa-common/zeroerroa-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-common/zeroerroa-common-redis/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/FastJson2JsonRedisSerializer.java create mode 100644 zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/RedisConfig.java create mode 100644 zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/service/RedisService.java create mode 100644 zeroerroa-common/zeroerroa-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-common/zeroerroa-common-seata/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-security/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableCustomConfig.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableRyFeignClients.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/InnerAuth.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/Logical.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresLogin.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresPermissions.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresRoles.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/InnerAuthAspect.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/PreAuthorizeAspect.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthLogic.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/ApplicationConfig.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/WebMvcConfig.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignAutoConfiguration.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignRequestInterceptor.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/handler/GlobalExceptionHandler.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/interceptor/HeaderInterceptor.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/service/TokenService.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/DictUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/SecurityUtils.java create mode 100644 zeroerroa-common/zeroerroa-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-common/zeroerroa-common-sensitive/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/annotation/Sensitive.java create mode 100644 zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/config/SensitiveJsonSerializer.java create mode 100644 zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/enums/DesensitizedType.java create mode 100644 zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/utils/DesensitizedUtil.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/pom.xml create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/annotation/EnableCustomSwagger2.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerAutoConfiguration.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerBeanPostProcessor.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerProperties.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerWebConfiguration.java create mode 100644 zeroerroa-common/zeroerroa-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 zeroerroa-gateway/.drone.yml create mode 100644 zeroerroa-gateway/Dockerfile create mode 100644 zeroerroa-gateway/docker.sh create mode 100644 zeroerroa-gateway/pom.xml create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/ZeroErrGatewayApplication.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/CaptchaConfig.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/GatewayConfig.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/KaptchaTextCreator.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/RouterFunctionConfiguration.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/SwaggerProvider.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/CaptchaProperties.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/IgnoreWhiteProperties.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/XssProperties.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/AuthFilter.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/BlackListUrlFilter.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/CacheRequestFilter.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/ValidateCodeFilter.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/XssFilter.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/GatewayExceptionHandler.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SentinelFallbackHandler.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SwaggerHandler.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/ValidateCodeHandler.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/ValidateCodeService.java create mode 100644 zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/impl/ValidateCodeServiceImpl.java create mode 100644 zeroerroa-gateway/src/main/resources/banner.txt create mode 100644 zeroerroa-gateway/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-gateway/src/main/resources/logback.xml create mode 100644 zeroerroa-gateway/start.sh create mode 100644 zeroerroa-modules/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-file/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/ZeroErrFileApplication.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/MinioConfig.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/ResourcesConfig.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/RuoYiConfig.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/controller/SysFileController.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/FastDfsSysFileServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/ISysFileService.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/LocalSysFileServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/MinioSysFileServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/utils/FileUploadUtils.java create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/resources/banner.txt create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-modules/zeroerroa-file/src/main/resources/logback.xml create mode 100644 zeroerroa-modules/zeroerroa-gen/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/ZeroErrGenApplication.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/config/GenConfig.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/controller/GenController.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTable.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTableColumn.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableColumnMapper.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableMapper.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableColumnServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableColumnService.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableService.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/GenUtils.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityInitializer.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityUtils.java create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/banner.txt create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/logback.xml create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/controller.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/domain.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/mapper.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/service.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/serviceImpl.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/sub-domain.java.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/js/api.js.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/sql/sql.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index-tree.vue.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index.vue.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index.vue.vm create mode 100644 zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/xml/mapper.xml.vm create mode 100644 zeroerroa-modules/zeroerroa-job/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/ZeroErrJobApplication.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/config/ScheduleConfig.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobController.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobLogController.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJob.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJobLog.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobLogMapper.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobMapper.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobLogService.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobService.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobLogServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/task/RyTask.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/AbstractQuartzJob.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/CronUtils.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/JobInvokeUtil.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzDisallowConcurrentExecution.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzJobExecution.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/ScheduleUtils.java create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/resources/banner.txt create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/resources/logback.xml create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobLogMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/ZeroErrRecruitApplication.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/EntryManageController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/HomePageController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitFollowController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitInterviewController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitPostGradeController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitProcessController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitStructureController.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/AnnouncementDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/EntryManagerDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/FollowDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/HomePageDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostDetailDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostStatusDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/RecordListDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/ToppingDTO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/EntryManage.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/InterviewTag.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostGrade.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostPlanFollow.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitPost.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTask.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTaskNode.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeFollowRecord.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeHandleRecord.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/AnnouncementVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ApprovedResultVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EditRecortVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EntryStatisticsVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/FollowVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/InterViewTagVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/PostListVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ResumeStatVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureMapVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructurePostVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/UserVO.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/EntryManageMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/InterviewTagMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostGradeMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostPlanFollowMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitPostMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskNodeMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeFollowRecordMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeHandleRecordMapper.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/EntryManageService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/InterviewTagService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostGradeService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostPlanFollowService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitPostService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskNodeService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeFollowRecordService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeHandleRecordService.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/EntryManageServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/InterviewTagServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostGradeServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostPlanFollowServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitPostServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskNodeServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeFollowRecordServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeHandleRecordServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/banner.txt create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/logback.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/EntryManageMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/InterviewTagMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostGradeMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostPlanFollowMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitPostMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskNodeMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeFollowRecordMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeHandleRecordMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/pom.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/ZeroErrSystemApplication.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysConfigController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDeptController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictDataController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictTypeController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysLogininforController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysMenuController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysNoticeController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysOperlogController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysPostController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysProfileController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysRoleController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserOnlineController.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysConfig.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysMenu.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysNotice.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysPost.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleDept.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleMenu.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserOnline.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserPost.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserRole.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/MetaVo.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/RouterVo.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/TreeSelect.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/RecruitStructureMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysConfigMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDeptMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictDataMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictTypeMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysLogininforMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysMenuMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysNoticeMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysOperLogMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysPostMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleDeptMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMenuMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserPostMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserRoleMapper.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysConfigService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDeptService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictDataService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictTypeService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysLogininforService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysMenuService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysNoticeService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysOperLogService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPermissionService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPostService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysRoleService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserOnlineService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/RecruitStructureService.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/RecruitStructureServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysConfigServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDeptServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictDataServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictTypeServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysLogininforServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysMenuServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysNoticeServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysOperLogServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPermissionServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPostServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysRoleServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserOnlineServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserServiceImpl.java create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/banner.txt create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/logback.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysConfigMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDeptMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictDataMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictTypeMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysLogininforMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysMenuMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysNoticeMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysOperLogMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysPostMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserPostMapper.xml create mode 100644 zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserRoleMapper.xml create mode 100644 zeroerroa-visual/pom.xml create mode 100644 zeroerroa-visual/zeroerroa-monitor/pom.xml create mode 100644 zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/RuoYiMonitorApplication.java create mode 100644 zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/config/WebSecurityConfigurer.java create mode 100644 zeroerroa-visual/zeroerroa-monitor/src/main/resources/banner.txt create mode 100644 zeroerroa-visual/zeroerroa-monitor/src/main/resources/bootstrap.yml create mode 100644 zeroerroa-visual/zeroerroa-monitor/src/main/resources/logback.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09bdfea --- /dev/null +++ b/.gitignore @@ -0,0 +1,46 @@ +###################################################################### +# Build Tools + +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +target/ +!.mvn/wrapper/maven-wrapper.jar + +###################################################################### +# IDE + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### JRebel ### +rebel.xml +### NetBeans ### +nbproject/private/ +build/* +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp + +!*/build/*.java +!*/build/*.html +!*/build/*.xml \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bd95df1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 若依 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..ca430d4 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +自动化办公组 \ No newline at end of file diff --git a/bin/clean.bat b/bin/clean.bat new file mode 100644 index 0000000..24c0974 --- /dev/null +++ b/bin/clean.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] target· +echo. + +%~d0 +cd %~dp0 + +cd .. +call mvn clean + +pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat new file mode 100644 index 0000000..c693ec0 --- /dev/null +++ b/bin/package.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] Weḅwar/jarļ +echo. + +%~d0 +cd %~dp0 + +cd .. +call mvn clean package -Dmaven.test.skip=true + +pause \ No newline at end of file diff --git a/bin/run-auth.bat b/bin/run-auth.bat new file mode 100644 index 0000000..5a02c5c --- /dev/null +++ b/bin/run-auth.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarAuth̡ +echo. + +cd %~dp0 +cd ../zeroerroa-auth/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-auth.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat new file mode 100644 index 0000000..7af8a1b --- /dev/null +++ b/bin/run-gateway.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarGateway̡ +echo. + +cd %~dp0 +cd ../zeroerroa-gateway/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-gateway.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat new file mode 100644 index 0000000..3da9987 --- /dev/null +++ b/bin/run-modules-file.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarModules-File̡ +echo. + +cd %~dp0 +cd ../zeroerroa-modules/zeroerroa-file/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-modules-file.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat new file mode 100644 index 0000000..42096d8 --- /dev/null +++ b/bin/run-modules-gen.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarModules-Gen̡ +echo. + +cd %~dp0 +cd ../zeroerroa-modules/zeroerroa-gen/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-modules-gen.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat new file mode 100644 index 0000000..862e13f --- /dev/null +++ b/bin/run-modules-job.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarModules-Job̡ +echo. + +cd %~dp0 +cd ../zeroerroa-modules/zeroerroa-job/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-modules-job.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat new file mode 100644 index 0000000..a9ccd08 --- /dev/null +++ b/bin/run-modules-system.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarModules-System̡ +echo. + +cd %~dp0 +cd ../zeroerroa-modules/zeroerroa-system/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-modules-system.jar + +cd bin +pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat new file mode 100644 index 0000000..d39ed4a --- /dev/null +++ b/bin/run-monitor.bat @@ -0,0 +1,14 @@ +@echo off +echo. +echo [Ϣ] ʹJarMonitor̡ +echo. + +cd %~dp0 +cd ../zeroerroa-visual/zeroerroa-monitor/target + +set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m + +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar zeroerroa-visual-monitor.jar + +cd bin +pause \ No newline at end of file diff --git a/docker/copy.sh b/docker/copy.sh new file mode 100644 index 0000000..f082cf1 --- /dev/null +++ b/docker/copy.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +# 复制项目的文件到对应docker路径,便于一键生成镜像。 +usage() { + echo "Usage: sh copy.sh" + exit 1 +} + + +# copy sql +echo "begin copy sql " +cp ../sql/ry_20231130.sql ./mysql/db +cp ../sql/ry_config_20231204.sql ./mysql/db + +# copy html +echo "begin copy html " +cp -r ../zeroerroa-ui/dist/** ./nginx/html/dist + + +# copy jar +echo "begin copy zeroerroa-gateway " +cp ../zeroerroa-gateway/target/zeroerroa-gateway.jar ./ruoyi/gateway/jar + +echo "begin copy zeroerroa-auth " +cp ../zeroerroa-auth/target/zeroerroa-auth.jar ./ruoyi/auth/jar + +echo "begin copy zeroerroa-visual " +cp ../zeroerroa-visual/zeroerroa-monitor/target/zeroerroa-visual-monitor.jar ./ruoyi/visual/monitor/jar + +echo "begin copy zeroerroa-modules-system " +cp ../zeroerroa-modules/zeroerroa-system/target/zeroerroa-modules-system.jar ./ruoyi/modules/system/jar + +echo "begin copy zeroerroa-modules-file " +cp ../zeroerroa-modules/zeroerroa-file/target/zeroerroa-modules-file.jar ./ruoyi/modules/file/jar + +echo "begin copy zeroerroa-modules-job " +cp ../zeroerroa-modules/zeroerroa-job/target/zeroerroa-modules-job.jar ./ruoyi/modules/job/jar + +echo "begin copy zeroerroa-modules-gen " +cp ../zeroerroa-modules/zeroerroa-gen/target/zeroerroa-modules-gen.jar ./ruoyi/modules/gen/jar + diff --git a/docker/deploy.sh b/docker/deploy.sh new file mode 100644 index 0000000..472b16f --- /dev/null +++ b/docker/deploy.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +# 使用说明,用来提示输入参数 +usage() { + echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]" + exit 1 +} + +# 开启所需端口 +port(){ + firewall-cmd --add-port=80/tcp --permanent + firewall-cmd --add-port=8080/tcp --permanent + firewall-cmd --add-port=8848/tcp --permanent + firewall-cmd --add-port=9848/tcp --permanent + firewall-cmd --add-port=9849/tcp --permanent + firewall-cmd --add-port=6379/tcp --permanent + firewall-cmd --add-port=3306/tcp --permanent + firewall-cmd --add-port=9100/tcp --permanent + firewall-cmd --add-port=9200/tcp --permanent + firewall-cmd --add-port=9201/tcp --permanent + firewall-cmd --add-port=9202/tcp --permanent + firewall-cmd --add-port=9203/tcp --permanent + firewall-cmd --add-port=9300/tcp --permanent + service firewalld restart +} + +# 启动基础环境(必须) +base(){ + docker-compose up -d zeroerroa-mysql zeroerroa-redis zeroerroa-nacos +} + +# 启动程序模块(必须) +modules(){ + docker-compose up -d zeroerroa-nginx zeroerroa-gateway zeroerroa-auth zeroerroa-modules-system +} + +# 关闭所有环境/模块 +stop(){ + docker-compose stop +} + +# 删除所有环境/模块 +rm(){ + docker-compose rm +} + +# 根据输入参数,选择执行对应方法,不输入则执行使用说明 +case "$1" in +"port") + port +;; +"base") + base +;; +"modules") + modules +;; +"stop") + stop +;; +"rm") + rm +;; +*) + usage +;; +esac diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..7cc9621 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,140 @@ +version : '3.8' +services: + zeroerroa-nacos: + container_name: zeroerroa-nacos + image: nacos/nacos-server + build: + context: ./nacos + environment: + - MODE=standalone + volumes: + - ./nacos/logs/:/home/nacos/logs + - ./nacos/conf/application.properties:/home/nacos/conf/application.properties + ports: + - "8848:8848" + - "9848:9848" + - "9849:9849" + depends_on: + - zeroerroa-mysql + zeroerroa-mysql: + container_name: zeroerroa-mysql + image: mysql:5.7 + build: + context: ./mysql + ports: + - "3306:3306" + volumes: + - ./mysql/conf:/etc/mysql/conf.d + - ./mysql/logs:/logs + - ./mysql/data:/var/lib/mysql + command: [ + 'mysqld', + '--innodb-buffer-pool-size=80M', + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_unicode_ci', + '--default-time-zone=+8:00', + '--lower-case-table-names=1' + ] + environment: + MYSQL_DATABASE: 'ry-cloud' + MYSQL_ROOT_PASSWORD: password + zeroerroa-redis: + container_name: zeroerroa-redis + image: redis + build: + context: ./redis + ports: + - "6379:6379" + volumes: + - ./redis/conf/redis.conf:/home/zeroerroa/redis/redis.conf + - ./redis/data:/data + command: redis-server /home/zeroerroa/redis/redis.conf + zeroerroa-nginx: + container_name: zeroerroa-nginx + image: nginx + build: + context: ./nginx + ports: + - "80:80" + volumes: + - ./nginx/html/dist:/home/zeroerroa/projects/zeroerroa-ui + - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf + - ./nginx/logs:/var/log/nginx + - ./nginx/conf.d:/etc/nginx/conf.d + depends_on: + - zeroerroa-gateway + links: + - zeroerroa-gateway + zeroerroa-gateway: + container_name: zeroerroa-gateway + build: + context: ./zeroerroa/gateway + dockerfile: dockerfile + ports: + - "8080:8080" + depends_on: + - zeroerroa-redis + links: + - zeroerroa-redis + zeroerroa-auth: + container_name: zeroerroa-auth + build: + context: ./zeroerroa/auth + dockerfile: dockerfile + ports: + - "9200:9200" + depends_on: + - zeroerroa-redis + links: + - zeroerroa-redis + zeroerroa-modules-system: + container_name: zeroerroa-modules-system + build: + context: ./zeroerroa/modules/system + dockerfile: dockerfile + ports: + - "9201:9201" + depends_on: + - zeroerroa-redis + - zeroerroa-mysql + links: + - zeroerroa-redis + - zeroerroa-mysql + zeroerroa-modules-gen: + container_name: zeroerroa-modules-gen + build: + context: ./zeroerroa/modules/gen + dockerfile: dockerfile + ports: + - "9202:9202" + depends_on: + - zeroerroa-mysql + links: + - zeroerroa-mysql + zeroerroa-modules-job: + container_name: zeroerroa-modules-job + build: + context: ./zeroerroa/modules/job + dockerfile: dockerfile + ports: + - "9203:9203" + depends_on: + - zeroerroa-mysql + links: + - zeroerroa-mysql + zeroerroa-modules-file: + container_name: zeroerroa-modules-file + build: + context: ./zeroerroa/modules/file + dockerfile: dockerfile + ports: + - "9300:9300" + volumes: + - ./zeroerroa/uploadPath:/home/zeroerroa/uploadPath + zeroerroa-visual-monitor: + container_name: zeroerroa-visual-monitor + build: + context: ./zeroerroa/visual/monitor + dockerfile: dockerfile + ports: + - "9100:9100" diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt new file mode 100644 index 0000000..0b22f3f --- /dev/null +++ b/docker/mysql/db/readme.txt @@ -0,0 +1 @@ +sqlĿ¼µнűdockerԶִС \ No newline at end of file diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile new file mode 100644 index 0000000..cc006f4 --- /dev/null +++ b/docker/mysql/dockerfile @@ -0,0 +1,7 @@ +# 基础镜像 +FROM mysql:5.7 +# author +MAINTAINER ruoyi + +# 执行sql脚本 +ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties new file mode 100644 index 0000000..7f2a61f --- /dev/null +++ b/docker/nacos/conf/application.properties @@ -0,0 +1,32 @@ +spring.datasource.platform=mysql +db.num=1 +db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.user=root +db.password=password + +nacos.naming.empty-service.auto-clean=true +nacos.naming.empty-service.clean.initial-delay-ms=50000 +nacos.naming.empty-service.clean.period-time-ms=30000 + +management.endpoints.web.exposure.include=* + +management.metrics.export.elastic.enabled=false +management.metrics.export.influx.enabled=false + +server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i + +server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs + +nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** + +nacos.core.auth.system.type=nacos +nacos.core.auth.enabled=false +nacos.core.auth.default.token.expire.seconds=18000 +nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789 +nacos.core.auth.caching.enabled=true +nacos.core.auth.enable.userAgentAuthWhite=false +nacos.core.auth.server.identity.key=serverIdentity +nacos.core.auth.server.identity.value=security + +nacos.istio.mcp.server.enabled=false diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile new file mode 100644 index 0000000..b74762c --- /dev/null +++ b/docker/nacos/dockerfile @@ -0,0 +1,7 @@ +# 基础镜像 +FROM nacos/nacos-server +# author +MAINTAINER ruoyi + +# 复制conf文件到路径 +COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf new file mode 100644 index 0000000..83de2a3 --- /dev/null +++ b/docker/nginx/conf/nginx.conf @@ -0,0 +1,41 @@ +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name localhost; + + location / { + root /home/ruoyi/projects/ruoyi-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + location /prod-api/{ + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://ruoyi-gateway:8080/; + } + + # 避免actuator暴露 + if ($request_uri ~ "/actuator") { + return 403; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } +} \ No newline at end of file diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile new file mode 100644 index 0000000..a71d13e --- /dev/null +++ b/docker/nginx/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM nginx +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi/projects/zeroerroa-ui +# 创建目录 +RUN mkdir -p /home/ruoyi/projects/zeroerroa-ui +# 指定路径 +WORKDIR /home/ruoyi/projects/zeroerroa-ui +# 复制conf文件到路径 +COPY ./conf/nginx.conf /etc/nginx/nginx.conf +# 复制html文件到路径 +COPY ./html/dist /home/ruoyi/projects/zeroerroa-ui diff --git a/docker/redis/conf/redis.conf b/docker/redis/conf/redis.conf new file mode 100644 index 0000000..d762d65 --- /dev/null +++ b/docker/redis/conf/redis.conf @@ -0,0 +1 @@ +# requirepass 123456 \ No newline at end of file diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile new file mode 100644 index 0000000..05c2bc4 --- /dev/null +++ b/docker/redis/dockerfile @@ -0,0 +1,13 @@ +# 基础镜像 +FROM redis +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi/redis +# 创建目录 +RUN mkdir -p /home/ruoyi/redis +# 指定路径 +WORKDIR /home/ruoyi/redis +# 复制conf文件到路径 +COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/dockerfile new file mode 100644 index 0000000..45b7d8a --- /dev/null +++ b/docker/ruoyi/auth/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-auth.jar /home/ruoyi/zeroerroa-auth.jar +# 启动认证服务 +ENTRYPOINT ["java","-jar","zeroerroa-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt new file mode 100644 index 0000000..c35ba27 --- /dev/null +++ b/docker/ruoyi/auth/jar/readme.txt @@ -0,0 +1 @@ +֤ĴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/dockerfile new file mode 100644 index 0000000..933beb2 --- /dev/null +++ b/docker/ruoyi/gateway/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-gateway.jar /home/ruoyi/zeroerroa-gateway.jar +# 启动网关服务 +ENTRYPOINT ["java","-jar","zeroerroa-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt new file mode 100644 index 0000000..5dfbec7 --- /dev/null +++ b/docker/ruoyi/gateway/jar/readme.txt @@ -0,0 +1 @@ +ģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/dockerfile new file mode 100644 index 0000000..276f5d5 --- /dev/null +++ b/docker/ruoyi/modules/file/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-modules-file.jar /home/ruoyi/zeroerroa-modules-file.jar +# 启动文件服务 +ENTRYPOINT ["java","-jar","zeroerroa-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/ruoyi/modules/file/jar/readme.txt new file mode 100644 index 0000000..bf2b2a7 --- /dev/null +++ b/docker/ruoyi/modules/file/jar/readme.txt @@ -0,0 +1 @@ +ļõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/dockerfile new file mode 100644 index 0000000..7d9d5c1 --- /dev/null +++ b/docker/ruoyi/modules/gen/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-modules-gen.jar /home/ruoyi/zeroerroa-modules-gen.jar +# 启动代码生成服务 +ENTRYPOINT ["java","-jar","zeroerroa-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/ruoyi/modules/gen/jar/readme.txt new file mode 100644 index 0000000..2f25c0a --- /dev/null +++ b/docker/ruoyi/modules/gen/jar/readme.txt @@ -0,0 +1 @@ +ŴɴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/dockerfile new file mode 100644 index 0000000..561029c --- /dev/null +++ b/docker/ruoyi/modules/job/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-modules-job.jar /home/ruoyi/zeroerroa-modules-job.jar +# 启动定时任务服务 +ENTRYPOINT ["java","-jar","zeroerroa-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/ruoyi/modules/job/jar/readme.txt new file mode 100644 index 0000000..58aea0b --- /dev/null +++ b/docker/ruoyi/modules/job/jar/readme.txt @@ -0,0 +1 @@ +ŶʱõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/dockerfile new file mode 100644 index 0000000..cd6136b --- /dev/null +++ b/docker/ruoyi/modules/system/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-modules-system.jar /home/ruoyi/zeroerroa-modules-system.jar +# 启动系统服务 +ENTRYPOINT ["java","-jar","zeroerroa-modules-system.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/ruoyi/modules/system/jar/readme.txt new file mode 100644 index 0000000..cfc2a92 --- /dev/null +++ b/docker/ruoyi/modules/system/jar/readme.txt @@ -0,0 +1 @@ +ϵͳģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/ruoyi/visual/monitor/dockerfile new file mode 100644 index 0000000..3b4c1e8 --- /dev/null +++ b/docker/ruoyi/visual/monitor/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM openjdk:8-jre +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/zeroerroa-visual-monitor.jar /home/ruoyi/zeroerroa-visual-monitor.jar +# 启动系统服务 +ENTRYPOINT ["java","-jar","zeroerroa-visual-monitor.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt new file mode 100644 index 0000000..62b2841 --- /dev/null +++ b/docker/ruoyi/visual/monitor/jar/readme.txt @@ -0,0 +1 @@ +żĴõjarļdockerӦá \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6c21791 --- /dev/null +++ b/pom.xml @@ -0,0 +1,318 @@ + + + 4.0.0 + + com.zeroerr + zeroerroa + 3.6.4 + + zeroerroa + http://www.zeroerroa.vip + ZeroErrOA管理系统 + + + 3.6.4 + UTF-8 + UTF-8 + 1.8 + 2.7.18 + 2021.0.8 + 2021.0.5.0 + 5.3.33 + 2.7.15 + 3.0.0 + 1.6.2 + 1.27.2 + 2.3.3 + 2.0.0 + 1.2.23 + 4.2.0 + 2.13.0 + 2.3 + 2.0.43 + 0.9.1 + 8.2.2 + 4.1.2 + 2.14.4 + 3.5.1 + 1.18.24 + + + + + + + + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + com.github.tobato + fastdfs-client + ${tobato.version} + + + + + io.swagger + swagger-models + ${swagger.core.version} + + + io.swagger + swagger-annotations + ${swagger.core.version} + + + + + pro.fessional + kaptcha + ${kaptcha.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + + com.alibaba + transmittable-thread-local + ${transmittable-thread-local.version} + + + + + com.zeroerr + zeroerroa-common-core + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-swagger + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-security + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-sensitive + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-datascope + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-datasource + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-seata + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-log + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-common-redis + ${zeroerroa.version} + + + + + com.zeroerr + zeroerroa-api-system + ${zeroerroa.version} + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + zeroerroa-auth + zeroerroa-gateway + zeroerroa-visual + zeroerroa-modules + zeroerroa-api + zeroerroa-common + + pom + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + + \ No newline at end of file diff --git a/sql/quartz.sql b/sql/quartz.sql new file mode 100644 index 0000000..cee613b --- /dev/null +++ b/sql/quartz.sql @@ -0,0 +1,174 @@ +DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; +DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; +DROP TABLE IF EXISTS QRTZ_LOCKS; +DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_TRIGGERS; +DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; +DROP TABLE IF EXISTS QRTZ_CALENDARS; + +-- ---------------------------- +-- 1、存储每一个已配置的 jobDetail 的详细信息 +-- ---------------------------- +create table QRTZ_JOB_DETAILS ( + sched_name varchar(120) not null comment '调度名称', + job_name varchar(200) not null comment '任务名称', + job_group varchar(200) not null comment '任务组名', + description varchar(250) null comment '相关介绍', + job_class_name varchar(250) not null comment '执行任务类名称', + is_durable varchar(1) not null comment '是否持久化', + is_nonconcurrent varchar(1) not null comment '是否并发', + is_update_data varchar(1) not null comment '是否更新数据', + requests_recovery varchar(1) not null comment '是否接受恢复执行', + job_data blob null comment '存放持久化job对象', + primary key (sched_name, job_name, job_group) +) engine=innodb comment = '任务详细信息表'; + +-- ---------------------------- +-- 2、 存储已配置的 Trigger 的信息 +-- ---------------------------- +create table QRTZ_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + trigger_name varchar(200) not null comment '触发器的名字', + trigger_group varchar(200) not null comment '触发器所属组的名字', + job_name varchar(200) not null comment 'qrtz_job_details表job_name的外键', + job_group varchar(200) not null comment 'qrtz_job_details表job_group的外键', + description varchar(250) null comment '相关介绍', + next_fire_time bigint(13) null comment '上一次触发时间(毫秒)', + prev_fire_time bigint(13) null comment '下一次触发时间(默认为-1表示不触发)', + priority integer null comment '优先级', + trigger_state varchar(16) not null comment '触发器状态', + trigger_type varchar(8) not null comment '触发器的类型', + start_time bigint(13) not null comment '开始时间', + end_time bigint(13) null comment '结束时间', + calendar_name varchar(200) null comment '日程表名称', + misfire_instr smallint(2) null comment '补偿执行的策略', + job_data blob null comment '存放持久化job对象', + primary key (sched_name, trigger_name, trigger_group), + foreign key (sched_name, job_name, job_group) references QRTZ_JOB_DETAILS(sched_name, job_name, job_group) +) engine=innodb comment = '触发器详细信息表'; + +-- ---------------------------- +-- 3、 存储简单的 Trigger,包括重复次数,间隔,以及已触发的次数 +-- ---------------------------- +create table QRTZ_SIMPLE_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + repeat_count bigint(7) not null comment '重复的次数统计', + repeat_interval bigint(12) not null comment '重复的间隔时间', + times_triggered bigint(10) not null comment '已经触发的次数', + primary key (sched_name, trigger_name, trigger_group), + foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) +) engine=innodb comment = '简单触发器的信息表'; + +-- ---------------------------- +-- 4、 存储 Cron Trigger,包括 Cron 表达式和时区信息 +-- ---------------------------- +create table QRTZ_CRON_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + cron_expression varchar(200) not null comment 'cron表达式', + time_zone_id varchar(80) comment '时区', + primary key (sched_name, trigger_name, trigger_group), + foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) +) engine=innodb comment = 'Cron类型的触发器表'; + +-- ---------------------------- +-- 5、 Trigger 作为 Blob 类型存储(用于 Quartz 用户用 JDBC 创建他们自己定制的 Trigger 类型,JobStore 并不知道如何存储实例的时候) +-- ---------------------------- +create table QRTZ_BLOB_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + blob_data blob null comment '存放持久化Trigger对象', + primary key (sched_name, trigger_name, trigger_group), + foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) +) engine=innodb comment = 'Blob类型的触发器表'; + +-- ---------------------------- +-- 6、 以 Blob 类型存储存放日历信息, quartz可配置一个日历来指定一个时间范围 +-- ---------------------------- +create table QRTZ_CALENDARS ( + sched_name varchar(120) not null comment '调度名称', + calendar_name varchar(200) not null comment '日历名称', + calendar blob not null comment '存放持久化calendar对象', + primary key (sched_name, calendar_name) +) engine=innodb comment = '日历信息表'; + +-- ---------------------------- +-- 7、 存储已暂停的 Trigger 组的信息 +-- ---------------------------- +create table QRTZ_PAUSED_TRIGGER_GRPS ( + sched_name varchar(120) not null comment '调度名称', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + primary key (sched_name, trigger_group) +) engine=innodb comment = '暂停的触发器表'; + +-- ---------------------------- +-- 8、 存储与已触发的 Trigger 相关的状态信息,以及相联 Job 的执行信息 +-- ---------------------------- +create table QRTZ_FIRED_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + entry_id varchar(95) not null comment '调度器实例id', + trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + instance_name varchar(200) not null comment '调度器实例名', + fired_time bigint(13) not null comment '触发的时间', + sched_time bigint(13) not null comment '定时器制定的时间', + priority integer not null comment '优先级', + state varchar(16) not null comment '状态', + job_name varchar(200) null comment '任务名称', + job_group varchar(200) null comment '任务组名', + is_nonconcurrent varchar(1) null comment '是否并发', + requests_recovery varchar(1) null comment '是否接受恢复执行', + primary key (sched_name, entry_id) +) engine=innodb comment = '已触发的触发器表'; + +-- ---------------------------- +-- 9、 存储少量的有关 Scheduler 的状态信息,假如是用于集群中,可以看到其他的 Scheduler 实例 +-- ---------------------------- +create table QRTZ_SCHEDULER_STATE ( + sched_name varchar(120) not null comment '调度名称', + instance_name varchar(200) not null comment '实例名称', + last_checkin_time bigint(13) not null comment '上次检查时间', + checkin_interval bigint(13) not null comment '检查间隔时间', + primary key (sched_name, instance_name) +) engine=innodb comment = '调度器状态表'; + +-- ---------------------------- +-- 10、 存储程序的悲观锁的信息(假如使用了悲观锁) +-- ---------------------------- +create table QRTZ_LOCKS ( + sched_name varchar(120) not null comment '调度名称', + lock_name varchar(40) not null comment '悲观锁名称', + primary key (sched_name, lock_name) +) engine=innodb comment = '存储的悲观锁信息表'; + +-- ---------------------------- +-- 11、 Quartz集群实现同步机制的行锁表 +-- ---------------------------- +create table QRTZ_SIMPROP_TRIGGERS ( + sched_name varchar(120) not null comment '调度名称', + trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', + trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', + str_prop_1 varchar(512) null comment 'String类型的trigger的第一个参数', + str_prop_2 varchar(512) null comment 'String类型的trigger的第二个参数', + str_prop_3 varchar(512) null comment 'String类型的trigger的第三个参数', + int_prop_1 int null comment 'int类型的trigger的第一个参数', + int_prop_2 int null comment 'int类型的trigger的第二个参数', + long_prop_1 bigint null comment 'long类型的trigger的第一个参数', + long_prop_2 bigint null comment 'long类型的trigger的第二个参数', + dec_prop_1 numeric(13,4) null comment 'decimal类型的trigger的第一个参数', + dec_prop_2 numeric(13,4) null comment 'decimal类型的trigger的第二个参数', + bool_prop_1 varchar(1) null comment 'Boolean类型的trigger的第一个参数', + bool_prop_2 varchar(1) null comment 'Boolean类型的trigger的第二个参数', + primary key (sched_name, trigger_name, trigger_group), + foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) +) engine=innodb comment = '同步机制的行锁表'; + +commit; \ No newline at end of file diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql new file mode 100644 index 0000000..a9b89d4 --- /dev/null +++ b/sql/ry_20240629.sql @@ -0,0 +1,697 @@ +SET NAMES utf8mb4; + +-- ---------------------------- +-- 1、部门表 +-- ---------------------------- +drop table if exists sys_dept; +create table sys_dept ( + dept_id bigint(20) not null auto_increment comment '部门id', + parent_id bigint(20) default 0 comment '父部门id', + ancestors varchar(50) default '' comment '祖级列表', + dept_name varchar(30) default '' comment '部门名称', + order_num int(4) default 0 comment '显示顺序', + leader varchar(20) default null comment '负责人', + phone varchar(11) default null comment '联系电话', + email varchar(50) default null comment '邮箱', + status char(1) default '0' comment '部门状态(0正常 1停用)', + del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + primary key (dept_id) +) engine=innodb auto_increment=200 comment = '部门表'; + +-- ---------------------------- +-- 初始化-部门表数据 +-- ---------------------------- +insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); +insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); + + +-- ---------------------------- +-- 2、用户信息表 +-- ---------------------------- +drop table if exists sys_user; +create table sys_user ( + user_id bigint(20) not null auto_increment comment '用户ID', + dept_id bigint(20) default null comment '部门ID', + user_name varchar(30) not null comment '用户账号', + nick_name varchar(30) not null comment '用户昵称', + user_type varchar(2) default '00' comment '用户类型(00系统用户)', + email varchar(50) default '' comment '用户邮箱', + phonenumber varchar(11) default '' comment '手机号码', + sex char(1) default '0' comment '用户性别(0男 1女 2未知)', + avatar varchar(100) default '' comment '头像地址', + password varchar(100) default '' comment '密码', + status char(1) default '0' comment '帐号状态(0正常 1停用)', + del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)', + login_ip varchar(128) default '' comment '最后登录IP', + login_date datetime comment '最后登录时间', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (user_id) +) engine=innodb auto_increment=100 comment = '用户信息表'; + +-- ---------------------------- +-- 初始化-用户信息表数据 +-- ---------------------------- +insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); + + +-- ---------------------------- +-- 3、岗位信息表 +-- ---------------------------- +drop table if exists sys_post; +create table sys_post +( + post_id bigint(20) not null auto_increment comment '岗位ID', + post_code varchar(64) not null comment '岗位编码', + post_name varchar(50) not null comment '岗位名称', + post_sort int(4) not null comment '显示顺序', + status char(1) not null comment '状态(0正常 1停用)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (post_id) +) engine=innodb comment = '岗位信息表'; + +-- ---------------------------- +-- 初始化-岗位信息表数据 +-- ---------------------------- +insert into sys_post values(1, 'ceo', '董事长', 1, '0', 'admin', sysdate(), '', null, ''); +insert into sys_post values(2, 'se', '项目经理', 2, '0', 'admin', sysdate(), '', null, ''); +insert into sys_post values(3, 'hr', '人力资源', 3, '0', 'admin', sysdate(), '', null, ''); +insert into sys_post values(4, 'user', '普通员工', 4, '0', 'admin', sysdate(), '', null, ''); + + +-- ---------------------------- +-- 4、角色信息表 +-- ---------------------------- +drop table if exists sys_role; +create table sys_role ( + role_id bigint(20) not null auto_increment comment '角色ID', + role_name varchar(30) not null comment '角色名称', + role_key varchar(100) not null comment '角色权限字符串', + role_sort int(4) not null comment '显示顺序', + data_scope char(1) default '1' comment '数据范围(1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限)', + menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', + dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', + status char(1) not null comment '角色状态(0正常 1停用)', + del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (role_id) +) engine=innodb auto_increment=100 comment = '角色信息表'; + +-- ---------------------------- +-- 初始化-角色信息表数据 +-- ---------------------------- +insert into sys_role values('1', '超级管理员', 'admin', 1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员'); +insert into sys_role values('2', '普通角色', 'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '普通角色'); + + +-- ---------------------------- +-- 5、菜单权限表 +-- ---------------------------- +drop table if exists sys_menu; +create table sys_menu ( + menu_id bigint(20) not null auto_increment comment '菜单ID', + menu_name varchar(50) not null comment '菜单名称', + parent_id bigint(20) default 0 comment '父菜单ID', + order_num int(4) default 0 comment '显示顺序', + path varchar(200) default '' comment '路由地址', + component varchar(255) default null comment '组件路径', + query varchar(255) default null comment '路由参数', + route_name varchar(50) default '' comment '路由名称', + is_frame int(1) default 1 comment '是否为外链(0是 1否)', + is_cache int(1) default 0 comment '是否缓存(0缓存 1不缓存)', + menu_type char(1) default '' comment '菜单类型(M目录 C菜单 F按钮)', + visible char(1) default 0 comment '菜单状态(0显示 1隐藏)', + status char(1) default 0 comment '菜单状态(0正常 1停用)', + perms varchar(100) default null comment '权限标识', + icon varchar(100) default '#' comment '菜单图标', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default '' comment '备注', + primary key (menu_id) +) engine=innodb auto_increment=2000 comment = '菜单权限表'; + +-- ---------------------------- +-- 初始化-菜单信息表数据 +-- ---------------------------- +-- 一级菜单 +insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); +insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); +insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); +insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +-- 二级菜单 +insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); +insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); +insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', sysdate(), '', null, '菜单管理菜单'); +insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', sysdate(), '', null, '部门管理菜单'); +insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 'admin', sysdate(), '', null, '岗位管理菜单'); +insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '字典管理菜单'); +insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '参数设置菜单'); +insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '通知公告菜单'); +insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '日志管理菜单'); +insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); +insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', '', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '定时任务菜单'); +insert into sys_menu values('111', 'Sentinel控制台', '2', '3', 'http://localhost:8718', '', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', sysdate(), '', null, '流量控制菜单'); +insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '服务治理菜单'); +insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '服务监控菜单'); +insert into sys_menu values('114', '表单构建', '3', '1', 'build', 'tool/build/index', '', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '表单构建菜单'); +insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '代码生成菜单'); +insert into sys_menu values('116', '系统接口', '3', '3', 'http://localhost:8080/swagger-ui/index.html', '', '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '系统接口菜单'); +-- 三级菜单 +insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'system/operlog/index', '', '', 1, 0, 'C', '0', '0', 'system:operlog:list', 'form', 'admin', sysdate(), '', null, '操作日志菜单'); +insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'system/logininfor/index', '', '', 1, 0, 'C', '0', '0', 'system:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '登录日志菜单'); +-- 用户管理按钮 +insert into sys_menu values('1000', '用户查询', '100', '1', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1001', '用户新增', '100', '2', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1002', '用户修改', '100', '3', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1003', '用户删除', '100', '4', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1004', '用户导出', '100', '5', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1005', '用户导入', '100', '6', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1006', '重置密码', '100', '7', '', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); +-- 角色管理按钮 +insert into sys_menu values('1007', '角色查询', '101', '1', '', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1008', '角色新增', '101', '2', '', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1009', '角色修改', '101', '3', '', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1010', '角色删除', '101', '4', '', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1011', '角色导出', '101', '5', '', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); +-- 菜单管理按钮 +insert into sys_menu values('1012', '菜单查询', '102', '1', '', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1013', '菜单新增', '102', '2', '', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1014', '菜单修改', '102', '3', '', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1015', '菜单删除', '102', '4', '', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); +-- 部门管理按钮 +insert into sys_menu values('1016', '部门查询', '103', '1', '', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1017', '部门新增', '103', '2', '', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1018', '部门修改', '103', '3', '', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1019', '部门删除', '103', '4', '', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); +-- 岗位管理按钮 +insert into sys_menu values('1020', '岗位查询', '104', '1', '', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1021', '岗位新增', '104', '2', '', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1022', '岗位修改', '104', '3', '', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1023', '岗位删除', '104', '4', '', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1024', '岗位导出', '104', '5', '', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', sysdate(), '', null, ''); +-- 字典管理按钮 +insert into sys_menu values('1025', '字典查询', '105', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1026', '字典新增', '105', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1027', '字典修改', '105', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1028', '字典删除', '105', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1029', '字典导出', '105', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); +-- 参数设置按钮 +insert into sys_menu values('1030', '参数查询', '106', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1031', '参数新增', '106', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1032', '参数修改', '106', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1033', '参数删除', '106', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1034', '参数导出', '106', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); +-- 通知公告按钮 +insert into sys_menu values('1035', '公告查询', '107', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1036', '公告新增', '107', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1037', '公告修改', '107', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1038', '公告删除', '107', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', sysdate(), '', null, ''); +-- 操作日志按钮 +insert into sys_menu values('1039', '操作查询', '500', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1040', '操作删除', '500', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1041', '日志导出', '500', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export', '#', 'admin', sysdate(), '', null, ''); +-- 登录日志按钮 +insert into sys_menu values('1042', '登录查询', '501', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1043', '登录删除', '501', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1044', '日志导出', '501', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1045', '账户解锁', '501', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock', '#', 'admin', sysdate(), '', null, ''); +-- 在线用户按钮 +insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, ''); +-- 定时任务按钮 +insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1054', '任务导出', '110', '6', '#', '', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export', '#', 'admin', sysdate(), '', null, ''); +-- 代码生成按钮 +insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', sysdate(), '', null, ''); +insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', sysdate(), '', null, ''); + + +-- ---------------------------- +-- 6、用户和角色关联表 用户N-1角色 +-- ---------------------------- +drop table if exists sys_user_role; +create table sys_user_role ( + user_id bigint(20) not null comment '用户ID', + role_id bigint(20) not null comment '角色ID', + primary key(user_id, role_id) +) engine=innodb comment = '用户和角色关联表'; + +-- ---------------------------- +-- 初始化-用户和角色关联表数据 +-- ---------------------------- +insert into sys_user_role values ('1', '1'); +insert into sys_user_role values ('2', '2'); + + +-- ---------------------------- +-- 7、角色和菜单关联表 角色1-N菜单 +-- ---------------------------- +drop table if exists sys_role_menu; +create table sys_role_menu ( + role_id bigint(20) not null comment '角色ID', + menu_id bigint(20) not null comment '菜单ID', + primary key(role_id, menu_id) +) engine=innodb comment = '角色和菜单关联表'; + +-- ---------------------------- +-- 初始化-角色和菜单关联表数据 +-- ---------------------------- +insert into sys_role_menu values ('2', '1'); +insert into sys_role_menu values ('2', '2'); +insert into sys_role_menu values ('2', '3'); +insert into sys_role_menu values ('2', '4'); +insert into sys_role_menu values ('2', '100'); +insert into sys_role_menu values ('2', '101'); +insert into sys_role_menu values ('2', '102'); +insert into sys_role_menu values ('2', '103'); +insert into sys_role_menu values ('2', '104'); +insert into sys_role_menu values ('2', '105'); +insert into sys_role_menu values ('2', '106'); +insert into sys_role_menu values ('2', '107'); +insert into sys_role_menu values ('2', '108'); +insert into sys_role_menu values ('2', '109'); +insert into sys_role_menu values ('2', '110'); +insert into sys_role_menu values ('2', '111'); +insert into sys_role_menu values ('2', '112'); +insert into sys_role_menu values ('2', '113'); +insert into sys_role_menu values ('2', '114'); +insert into sys_role_menu values ('2', '115'); +insert into sys_role_menu values ('2', '116'); +insert into sys_role_menu values ('2', '500'); +insert into sys_role_menu values ('2', '501'); +insert into sys_role_menu values ('2', '1000'); +insert into sys_role_menu values ('2', '1001'); +insert into sys_role_menu values ('2', '1002'); +insert into sys_role_menu values ('2', '1003'); +insert into sys_role_menu values ('2', '1004'); +insert into sys_role_menu values ('2', '1005'); +insert into sys_role_menu values ('2', '1006'); +insert into sys_role_menu values ('2', '1007'); +insert into sys_role_menu values ('2', '1008'); +insert into sys_role_menu values ('2', '1009'); +insert into sys_role_menu values ('2', '1010'); +insert into sys_role_menu values ('2', '1011'); +insert into sys_role_menu values ('2', '1012'); +insert into sys_role_menu values ('2', '1013'); +insert into sys_role_menu values ('2', '1014'); +insert into sys_role_menu values ('2', '1015'); +insert into sys_role_menu values ('2', '1016'); +insert into sys_role_menu values ('2', '1017'); +insert into sys_role_menu values ('2', '1018'); +insert into sys_role_menu values ('2', '1019'); +insert into sys_role_menu values ('2', '1020'); +insert into sys_role_menu values ('2', '1021'); +insert into sys_role_menu values ('2', '1022'); +insert into sys_role_menu values ('2', '1023'); +insert into sys_role_menu values ('2', '1024'); +insert into sys_role_menu values ('2', '1025'); +insert into sys_role_menu values ('2', '1026'); +insert into sys_role_menu values ('2', '1027'); +insert into sys_role_menu values ('2', '1028'); +insert into sys_role_menu values ('2', '1029'); +insert into sys_role_menu values ('2', '1030'); +insert into sys_role_menu values ('2', '1031'); +insert into sys_role_menu values ('2', '1032'); +insert into sys_role_menu values ('2', '1033'); +insert into sys_role_menu values ('2', '1034'); +insert into sys_role_menu values ('2', '1035'); +insert into sys_role_menu values ('2', '1036'); +insert into sys_role_menu values ('2', '1037'); +insert into sys_role_menu values ('2', '1038'); +insert into sys_role_menu values ('2', '1039'); +insert into sys_role_menu values ('2', '1040'); +insert into sys_role_menu values ('2', '1041'); +insert into sys_role_menu values ('2', '1042'); +insert into sys_role_menu values ('2', '1043'); +insert into sys_role_menu values ('2', '1044'); +insert into sys_role_menu values ('2', '1045'); +insert into sys_role_menu values ('2', '1046'); +insert into sys_role_menu values ('2', '1047'); +insert into sys_role_menu values ('2', '1048'); +insert into sys_role_menu values ('2', '1049'); +insert into sys_role_menu values ('2', '1050'); +insert into sys_role_menu values ('2', '1051'); +insert into sys_role_menu values ('2', '1052'); +insert into sys_role_menu values ('2', '1053'); +insert into sys_role_menu values ('2', '1054'); +insert into sys_role_menu values ('2', '1055'); +insert into sys_role_menu values ('2', '1056'); +insert into sys_role_menu values ('2', '1057'); +insert into sys_role_menu values ('2', '1058'); +insert into sys_role_menu values ('2', '1059'); +insert into sys_role_menu values ('2', '1060'); + +-- ---------------------------- +-- 8、角色和部门关联表 角色1-N部门 +-- ---------------------------- +drop table if exists sys_role_dept; +create table sys_role_dept ( + role_id bigint(20) not null comment '角色ID', + dept_id bigint(20) not null comment '部门ID', + primary key(role_id, dept_id) +) engine=innodb comment = '角色和部门关联表'; + +-- ---------------------------- +-- 初始化-角色和部门关联表数据 +-- ---------------------------- +insert into sys_role_dept values ('2', '100'); +insert into sys_role_dept values ('2', '101'); +insert into sys_role_dept values ('2', '105'); + + +-- ---------------------------- +-- 9、用户与岗位关联表 用户1-N岗位 +-- ---------------------------- +drop table if exists sys_user_post; +create table sys_user_post +( + user_id bigint(20) not null comment '用户ID', + post_id bigint(20) not null comment '岗位ID', + primary key (user_id, post_id) +) engine=innodb comment = '用户与岗位关联表'; + +-- ---------------------------- +-- 初始化-用户与岗位关联表数据 +-- ---------------------------- +insert into sys_user_post values ('1', '1'); +insert into sys_user_post values ('2', '2'); + + +-- ---------------------------- +-- 10、操作日志记录 +-- ---------------------------- +drop table if exists sys_oper_log; +create table sys_oper_log ( + oper_id bigint(20) not null auto_increment comment '日志主键', + title varchar(50) default '' comment '模块标题', + business_type int(2) default 0 comment '业务类型(0其它 1新增 2修改 3删除)', + method varchar(200) default '' comment '方法名称', + request_method varchar(10) default '' comment '请求方式', + operator_type int(1) default 0 comment '操作类别(0其它 1后台用户 2手机端用户)', + oper_name varchar(50) default '' comment '操作人员', + dept_name varchar(50) default '' comment '部门名称', + oper_url varchar(255) default '' comment '请求URL', + oper_ip varchar(128) default '' comment '主机地址', + oper_location varchar(255) default '' comment '操作地点', + oper_param varchar(2000) default '' comment '请求参数', + json_result varchar(2000) default '' comment '返回参数', + status int(1) default 0 comment '操作状态(0正常 1异常)', + error_msg varchar(2000) default '' comment '错误消息', + oper_time datetime comment '操作时间', + cost_time bigint(20) default 0 comment '消耗时间', + primary key (oper_id), + key idx_sys_oper_log_bt (business_type), + key idx_sys_oper_log_s (status), + key idx_sys_oper_log_ot (oper_time) +) engine=innodb auto_increment=100 comment = '操作日志记录'; + + +-- ---------------------------- +-- 11、字典类型表 +-- ---------------------------- +drop table if exists sys_dict_type; +create table sys_dict_type +( + dict_id bigint(20) not null auto_increment comment '字典主键', + dict_name varchar(100) default '' comment '字典名称', + dict_type varchar(100) default '' comment '字典类型', + status char(1) default '0' comment '状态(0正常 1停用)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (dict_id), + unique (dict_type) +) engine=innodb auto_increment=100 comment = '字典类型表'; + +insert into sys_dict_type values(1, '用户性别', 'sys_user_sex', '0', 'admin', sysdate(), '', null, '用户性别列表'); +insert into sys_dict_type values(2, '菜单状态', 'sys_show_hide', '0', 'admin', sysdate(), '', null, '菜单状态列表'); +insert into sys_dict_type values(3, '系统开关', 'sys_normal_disable', '0', 'admin', sysdate(), '', null, '系统开关列表'); +insert into sys_dict_type values(4, '任务状态', 'sys_job_status', '0', 'admin', sysdate(), '', null, '任务状态列表'); +insert into sys_dict_type values(5, '任务分组', 'sys_job_group', '0', 'admin', sysdate(), '', null, '任务分组列表'); +insert into sys_dict_type values(6, '系统是否', 'sys_yes_no', '0', 'admin', sysdate(), '', null, '系统是否列表'); +insert into sys_dict_type values(7, '通知类型', 'sys_notice_type', '0', 'admin', sysdate(), '', null, '通知类型列表'); +insert into sys_dict_type values(8, '通知状态', 'sys_notice_status', '0', 'admin', sysdate(), '', null, '通知状态列表'); +insert into sys_dict_type values(9, '操作类型', 'sys_oper_type', '0', 'admin', sysdate(), '', null, '操作类型列表'); +insert into sys_dict_type values(10, '系统状态', 'sys_common_status', '0', 'admin', sysdate(), '', null, '登录状态列表'); + + +-- ---------------------------- +-- 12、字典数据表 +-- ---------------------------- +drop table if exists sys_dict_data; +create table sys_dict_data +( + dict_code bigint(20) not null auto_increment comment '字典编码', + dict_sort int(4) default 0 comment '字典排序', + dict_label varchar(100) default '' comment '字典标签', + dict_value varchar(100) default '' comment '字典键值', + dict_type varchar(100) default '' comment '字典类型', + css_class varchar(100) default null comment '样式属性(其他样式扩展)', + list_class varchar(100) default null comment '表格回显样式', + is_default char(1) default 'N' comment '是否默认(Y是 N否)', + status char(1) default '0' comment '状态(0正常 1停用)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (dict_code) +) engine=innodb auto_increment=100 comment = '字典数据表'; + +insert into sys_dict_data values(1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', sysdate(), '', null, '性别男'); +insert into sys_dict_data values(2, 2, '女', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '性别女'); +insert into sys_dict_data values(3, 3, '未知', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '性别未知'); +insert into sys_dict_data values(4, 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单'); +insert into sys_dict_data values(5, 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '隐藏菜单'); +insert into sys_dict_data values(6, 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); +insert into sys_dict_data values(7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); +insert into sys_dict_data values(8, 1, '正常', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); +insert into sys_dict_data values(9, 2, '暂停', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); +insert into sys_dict_data values(10, 1, '默认', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', sysdate(), '', null, '默认分组'); +insert into sys_dict_data values(11, 2, '系统', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', sysdate(), '', null, '系统分组'); +insert into sys_dict_data values(12, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是'); +insert into sys_dict_data values(13, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '系统默认否'); +insert into sys_dict_data values(14, 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知'); +insert into sys_dict_data values(15, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', sysdate(), '', null, '公告'); +insert into sys_dict_data values(16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); +insert into sys_dict_data values(17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '关闭状态'); +insert into sys_dict_data values(18, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '其他操作'); +insert into sys_dict_data values(19, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '新增操作'); +insert into sys_dict_data values(20, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '修改操作'); +insert into sys_dict_data values(21, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '删除操作'); +insert into sys_dict_data values(22, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作'); +insert into sys_dict_data values(23, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作'); +insert into sys_dict_data values(24, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作'); +insert into sys_dict_data values(25, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '强退操作'); +insert into sys_dict_data values(26, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作'); +insert into sys_dict_data values(27, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '清空操作'); +insert into sys_dict_data values(28, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态'); +insert into sys_dict_data values(29, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); + + +-- ---------------------------- +-- 13、参数配置表 +-- ---------------------------- +drop table if exists sys_config; +create table sys_config ( + config_id int(5) not null auto_increment comment '参数主键', + config_name varchar(100) default '' comment '参数名称', + config_key varchar(100) default '' comment '参数键名', + config_value varchar(500) default '' comment '参数键值', + config_type char(1) default 'N' comment '系统内置(Y是 N否)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (config_id) +) engine=innodb auto_increment=100 comment = '参数配置表'; + +insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); +insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' ); +insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark,浅色主题theme-light' ); +insert into sys_config values(4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能(true开启,false关闭)'); +insert into sys_config values(5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制,多个匹配项以;分隔,支持匹配(*通配、网段)'); + + +-- ---------------------------- +-- 14、系统访问记录 +-- ---------------------------- +drop table if exists sys_logininfor; +create table sys_logininfor ( + info_id bigint(20) not null auto_increment comment '访问ID', + user_name varchar(50) default '' comment '用户账号', + ipaddr varchar(128) default '' comment '登录IP地址', + status char(1) default '0' comment '登录状态(0成功 1失败)', + msg varchar(255) default '' comment '提示信息', + access_time datetime comment '访问时间', + primary key (info_id), + key idx_sys_logininfor_s (status), + key idx_sys_logininfor_lt (access_time) +) engine=innodb auto_increment=100 comment = '系统访问记录'; + + +-- ---------------------------- +-- 15、定时任务调度表 +-- ---------------------------- +drop table if exists sys_job; +create table sys_job ( + job_id bigint(20) not null auto_increment comment '任务ID', + job_name varchar(64) default '' comment '任务名称', + job_group varchar(64) default 'DEFAULT' comment '任务组名', + invoke_target varchar(500) not null comment '调用目标字符串', + cron_expression varchar(255) default '' comment 'cron执行表达式', + misfire_policy varchar(20) default '3' comment '计划执行错误策略(1立即执行 2执行一次 3放弃执行)', + concurrent char(1) default '1' comment '是否并发执行(0允许 1禁止)', + status char(1) default '0' comment '状态(0正常 1暂停)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default '' comment '备注信息', + primary key (job_id, job_name, job_group) +) engine=innodb auto_increment=100 comment = '定时任务调度表'; + +insert into sys_job values(1, '系统默认(无参)', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); +insert into sys_job values(2, '系统默认(有参)', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); +insert into sys_job values(3, '系统默认(多参)', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); + + +-- ---------------------------- +-- 16、定时任务调度日志表 +-- ---------------------------- +drop table if exists sys_job_log; +create table sys_job_log ( + job_log_id bigint(20) not null auto_increment comment '任务日志ID', + job_name varchar(64) not null comment '任务名称', + job_group varchar(64) not null comment '任务组名', + invoke_target varchar(500) not null comment '调用目标字符串', + job_message varchar(500) comment '日志信息', + status char(1) default '0' comment '执行状态(0正常 1失败)', + exception_info varchar(2000) default '' comment '异常信息', + create_time datetime comment '创建时间', + primary key (job_log_id) +) engine=innodb comment = '定时任务调度日志表'; + + +-- ---------------------------- +-- 17、通知公告表 +-- ---------------------------- +drop table if exists sys_notice; +create table sys_notice ( + notice_id int(4) not null auto_increment comment '公告ID', + notice_title varchar(50) not null comment '公告标题', + notice_type char(1) not null comment '公告类型(1通知 2公告)', + notice_content longblob default null comment '公告内容', + status char(1) default '0' comment '公告状态(0正常 1关闭)', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(255) default null comment '备注', + primary key (notice_id) +) engine=innodb auto_increment=10 comment = '通知公告表'; + +-- ---------------------------- +-- 初始化-公告信息表数据 +-- ---------------------------- +insert into sys_notice values('1', '温馨提醒:2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); +insert into sys_notice values('2', '维护通知:2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); + + +-- ---------------------------- +-- 18、代码生成业务表 +-- ---------------------------- +drop table if exists gen_table; +create table gen_table ( + table_id bigint(20) not null auto_increment comment '编号', + table_name varchar(200) default '' comment '表名称', + table_comment varchar(500) default '' comment '表描述', + sub_table_name varchar(64) default null comment '关联子表的表名', + sub_table_fk_name varchar(64) default null comment '子表关联的外键名', + class_name varchar(100) default '' comment '实体类名称', + tpl_category varchar(200) default 'crud' comment '使用的模板(crud单表操作 tree树表操作)', + tpl_web_type varchar(30) default '' comment '前端模板类型(element-ui模版 element-plus模版)', + package_name varchar(100) comment '生成包路径', + module_name varchar(30) comment '生成模块名', + business_name varchar(30) comment '生成业务名', + function_name varchar(50) comment '生成功能名', + function_author varchar(50) comment '生成功能作者', + gen_type char(1) default '0' comment '生成代码方式(0zip压缩包 1自定义路径)', + gen_path varchar(200) default '/' comment '生成路径(不填默认项目路径)', + options varchar(1000) comment '其它生成选项', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (table_id) +) engine=innodb auto_increment=1 comment = '代码生成业务表'; + + +-- ---------------------------- +-- 19、代码生成业务表字段 +-- ---------------------------- +drop table if exists gen_table_column; +create table gen_table_column ( + column_id bigint(20) not null auto_increment comment '编号', + table_id bigint(20) comment '归属表编号', + column_name varchar(200) comment '列名称', + column_comment varchar(500) comment '列描述', + column_type varchar(100) comment '列类型', + java_type varchar(500) comment 'JAVA类型', + java_field varchar(200) comment 'JAVA字段名', + is_pk char(1) comment '是否主键(1是)', + is_increment char(1) comment '是否自增(1是)', + is_required char(1) comment '是否必填(1是)', + is_insert char(1) comment '是否为插入字段(1是)', + is_edit char(1) comment '是否编辑字段(1是)', + is_list char(1) comment '是否列表字段(1是)', + is_query char(1) comment '是否查询字段(1是)', + query_type varchar(200) default 'EQ' comment '查询方式(等于、不等于、大于、小于、范围)', + html_type varchar(200) comment '显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件)', + dict_type varchar(200) default '' comment '字典类型', + sort int comment '排序', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + primary key (column_id) +) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; diff --git a/sql/ry_config_20231204.sql b/sql/ry_config_20231204.sql new file mode 100644 index 0000000..226d17f --- /dev/null +++ b/sql/ry_config_20231204.sql @@ -0,0 +1,219 @@ +DROP DATABASE IF EXISTS `ry-config`; + +CREATE DATABASE `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +USE `ry-config`; + +/******************************************/ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(255) DEFAULT NULL, + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL, + `c_use` varchar(64) DEFAULT NULL, + `effect` varchar(64) DEFAULT NULL, + `type` varchar(64) DEFAULT NULL, + `c_schema` text, + `encrypted_data_key` text COMMENT '秘钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema, encrypted_data_key) values +(1,'application-dev.yml','DEFAULT_GROUP','spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n min-request-size: 8192\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','58dde4e3760499d3bac2d77a3a1e9018','2020-05-20 12:00:00','2023-12-04 08:08:23','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','',''), +(2,'zeroerroa-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: zeroerroa-auth\n uri: lb://zeroerroa-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: zeroerroa-gen\n uri: lb://zeroerroa-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: zeroerroa-job\n uri: lb://zeroerroa-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: zeroerroa-system\n uri: lb://zeroerroa-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: zeroerroa-file\n uri: lb://zeroerroa-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), +(3,'zeroerroa-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), +(4,'zeroerroa-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2022-09-29 02:48:54','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), +(5,'zeroerroa-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zeroerr.system\n # 配置mapper的扫描,找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip','00678c89684ec0b825cb9b71e032db64','2020-11-20 00:00:00','2023-12-04 07:51:28','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), +(6,'zeroerroa-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zeroerr.gen.domain\n # 配置mapper的扫描,找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.zeroerr.system\n # 自动去除表前缀,默认是false\n autoRemovePre: false\n # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), +(7,'zeroerroa-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zeroerr.job.domain\n # 配置mapper的扫描,找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), +(8,'zeroerroa-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), +(9,'sentinel-zeroerroa-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"zeroerroa-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zeroerroa-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zeroerroa-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zeroerroa-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,''); + + +/******************************************/ +/* 表名称 = config_info_aggr */ +/******************************************/ +CREATE TABLE `config_info_aggr` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(255) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text COMMENT '秘钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` ( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID,空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额,0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限,单位为字节,0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数,,0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` ( + `id` bigint(64) unsigned NOT NULL, + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(255) NOT NULL, + `group_id` varchar(128) NOT NULL, + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL, + `md5` varchar(32) DEFAULT NULL, + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `src_user` text, + `src_ip` varchar(50) DEFAULT NULL, + `op_type` char(10) DEFAULT NULL, + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text COMMENT '秘钥', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 数据库全名 = nacos_config */ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额,0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限,单位为字节,0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` ( + `username` varchar(50) NOT NULL PRIMARY KEY, + `password` varchar(500) NOT NULL, + `enabled` boolean NOT NULL +); + +CREATE TABLE `roles` ( + `username` varchar(50) NOT NULL, + `role` varchar(50) NOT NULL, + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` ( + `role` varchar(50) NOT NULL, + `resource` varchar(255) NOT NULL, + `action` varchar(8) NOT NULL, + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); + +INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/sql/ry_seata_20210128.sql b/sql/ry_seata_20210128.sql new file mode 100644 index 0000000..41163c1 --- /dev/null +++ b/sql/ry_seata_20210128.sql @@ -0,0 +1,80 @@ +DROP DATABASE IF EXISTS `ry-seata`; + +CREATE DATABASE `ry-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +USE `ry-seata`; + +-- -------------------------------- The script used when storeMode is 'db' -------------------------------- +-- the table to store GlobalSession data +CREATE TABLE IF NOT EXISTS `global_table` +( + `xid` VARCHAR(128) NOT NULL, + `transaction_id` BIGINT, + `status` TINYINT NOT NULL, + `application_id` VARCHAR(32), + `transaction_service_group` VARCHAR(32), + `transaction_name` VARCHAR(128), + `timeout` INT, + `begin_time` BIGINT, + `application_data` VARCHAR(2000), + `gmt_create` DATETIME, + `gmt_modified` DATETIME, + PRIMARY KEY (`xid`), + KEY `idx_gmt_modified_status` (`gmt_modified`, `status`), + KEY `idx_transaction_id` (`transaction_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- the table to store BranchSession data +CREATE TABLE IF NOT EXISTS `branch_table` +( + `branch_id` BIGINT NOT NULL, + `xid` VARCHAR(128) NOT NULL, + `transaction_id` BIGINT, + `resource_group_id` VARCHAR(32), + `resource_id` VARCHAR(256), + `branch_type` VARCHAR(8), + `status` TINYINT, + `client_id` VARCHAR(64), + `application_data` VARCHAR(2000), + `gmt_create` DATETIME(6), + `gmt_modified` DATETIME(6), + PRIMARY KEY (`branch_id`), + KEY `idx_xid` (`xid`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- the table to store lock data +CREATE TABLE IF NOT EXISTS `lock_table` +( + `row_key` VARCHAR(128) NOT NULL, + `xid` VARCHAR(96), + `transaction_id` BIGINT, + `branch_id` BIGINT NOT NULL, + `resource_id` VARCHAR(256), + `table_name` VARCHAR(32), + `pk` VARCHAR(36), + `gmt_create` DATETIME, + `gmt_modified` DATETIME, + PRIMARY KEY (`row_key`), + KEY `idx_branch_id` (`branch_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- for AT mode you must to init this sql for you business database. the seata server not need it. +CREATE TABLE IF NOT EXISTS `undo_log` +( + `branch_id` BIGINT(20) NOT NULL COMMENT 'branch transaction id', + `xid` VARCHAR(100) NOT NULL COMMENT 'global transaction id', + `context` VARCHAR(128) NOT NULL COMMENT 'undo_log context,such as serialization', + `rollback_info` LONGBLOB NOT NULL COMMENT 'rollback info', + `log_status` INT(11) NOT NULL COMMENT '0:normal status,1:defense status', + `log_created` DATETIME(6) NOT NULL COMMENT 'create datetime', + `log_modified` DATETIME(6) NOT NULL COMMENT 'modify datetime', + UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`) +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 COMMENT ='AT transaction mode undo table'; \ No newline at end of file diff --git a/zeroerroa-api/pom.xml b/zeroerroa-api/pom.xml new file mode 100644 index 0000000..eb3e255 --- /dev/null +++ b/zeroerroa-api/pom.xml @@ -0,0 +1,22 @@ + + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + + zeroerroa-api-system + + + zeroerroa-api + pom + + + zeroerroa-api系统接口 + + + diff --git a/zeroerroa-api/zeroerroa-api-system/pom.xml b/zeroerroa-api/zeroerroa-api-system/pom.xml new file mode 100644 index 0000000..90ac91b --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/pom.xml @@ -0,0 +1,28 @@ + + + + com.zeroerr + zeroerroa-api + 3.6.4 + + 4.0.0 + + zeroerroa-api-system + + + zeroerroa-api-system系统接口模块 + + + + + + + com.zeroerr + zeroerroa-common-core + + + + + \ No newline at end of file diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteFileService.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteFileService.java new file mode 100644 index 0000000..593acc3 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteFileService.java @@ -0,0 +1,29 @@ +package com.zeroerr.system.api; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.constant.ServiceNameConstants; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.domain.SysFile; +import com.zeroerr.system.api.factory.RemoteFileFallbackFactory; + +/** + * 文件服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) +public interface RemoteFileService +{ + /** + * 上传文件 + * + * @param file 文件信息 + * @return 结果 + */ + @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R upload(@RequestPart(value = "file") MultipartFile file); +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteLogService.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteLogService.java new file mode 100644 index 0000000..3d91335 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteLogService.java @@ -0,0 +1,41 @@ +package com.zeroerr.system.api; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.ServiceNameConstants; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.domain.SysLogininfor; +import com.zeroerr.system.api.domain.SysOperLog; +import com.zeroerr.system.api.factory.RemoteLogFallbackFactory; + +/** + * 日志服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) +public interface RemoteLogService +{ + /** + * 保存系统日志 + * + * @param sysOperLog 日志实体 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/operlog") + public R saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception; + + /** + * 保存访问记录 + * + * @param sysLogininfor 访问实体 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/logininfor") + public R saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java new file mode 100644 index 0000000..ce11fca --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java @@ -0,0 +1,59 @@ +package com.zeroerr.system.api; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.ServiceNameConstants; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.factory.RemoteUserFallbackFactory; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 用户服务 + * + * @author ruoyi + */ +@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) +public interface RemoteUserService +{ + /** + * 通过用户名查询用户信息 + * + * @param username 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/user/info/{username}") + public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 注册用户信息 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/user/register") + public R registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 记录用户登录IP地址和登录时间 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PutMapping("/user/recordlogin") + public R recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + + @GetMapping("/user/selectUserById/{userId}") + R selectUserById(@PathVariable("userId") Long userId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/RecruitStructure.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/RecruitStructure.java new file mode 100644 index 0000000..88f76ac --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/RecruitStructure.java @@ -0,0 +1,256 @@ +package com.zeroerr.system.api.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.zeroerr.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +/** + * 组织架构节点表 recruit_structure + * + * @author lw + */ +@TableName("recruit_structure") +public class RecruitStructure extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 部门ID */ + @TableId(value = "node_id", type = IdType.AUTO) + private Long nodeId; + + /** 父部门ID */ + private Long parentId; + + /** 祖级列表 */ + private String ancestors; + + /** 部门名称 */ + private String nodeName; + + /** 显示顺序 */ + private Integer orderNum; + + /** 负责人 */ + private String leader; + + /** 联系电话 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 部门状态:0正常,1停用 */ + private String status; + + /** 删除标志(0代表存在 2代表删除) */ + @TableLogic + private String delFlag; + + + /** 父部门名称 */ + @TableField(exist = false) + private String parentName; + + private Integer type; + + private Integer postType; + + private String taskId; + + private LocalDate postCompleteDate; + + public LocalDate getPostCompleteDate() { + return postCompleteDate; + } + + public void setPostCompleteDate(LocalDate postCompleteDate) { + this.postCompleteDate = postCompleteDate; + } + + + public Integer getPostType() { + return postType; + } + + public void setPostType(Integer postType) { + this.postType = postType; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + + + /** 子部门 */ + @TableField(exist = false) + private List children = new ArrayList(); + + public Long getNodeId() + { + return nodeId; + } + + public void setNodeId(Long nodeId) + { + this.nodeId = nodeId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + @NotBlank(message = "节点名称不能为空") + @Size(min = 0, max = 30, message = "节点名称长度不能超过30个字符") + public String getNodeName() + { + return nodeName; + } + + public void setNodeName(String nodeName) + { + this.nodeName = nodeName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getLeader() + { + return leader; + } + + public void setLeader(String leader) + { + this.leader = leader; + } + + @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("nodeId", getNodeId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("nodeName", getNodeName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("type", getType()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDept.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDept.java new file mode 100644 index 0000000..a4bc30b --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDept.java @@ -0,0 +1,203 @@ +package com.zeroerr.system.api.domain; + +import java.util.ArrayList; +import java.util.List; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 部门表 sys_dept + * + * @author ruoyi + */ +public class SysDept extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 部门ID */ + private Long deptId; + + /** 父部门ID */ + private Long parentId; + + /** 祖级列表 */ + private String ancestors; + + /** 部门名称 */ + private String deptName; + + /** 显示顺序 */ + private Integer orderNum; + + /** 负责人 */ + private String leader; + + /** 联系电话 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 部门状态:0正常,1停用 */ + private String status; + + /** 删除标志(0代表存在 2代表删除) */ + private String delFlag; + + /** 父部门名称 */ + private String parentName; + + /** 子部门 */ + private List children = new ArrayList(); + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + @NotBlank(message = "部门名称不能为空") + @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getLeader() + { + return leader; + } + + public void setLeader(String leader) + { + this.leader = leader; + } + + @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictData.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictData.java new file mode 100644 index 0000000..7db959b --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictData.java @@ -0,0 +1,176 @@ +package com.zeroerr.system.api.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 字典数据表 sys_dict_data + * + * @author ruoyi + */ +public class SysDictData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典编码 */ + @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + private Long dictCode; + + /** 字典排序 */ + @Excel(name = "字典排序", cellType = ColumnType.NUMERIC) + private Long dictSort; + + /** 字典标签 */ + @Excel(name = "字典标签") + private String dictLabel; + + /** 字典键值 */ + @Excel(name = "字典键值") + private String dictValue; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + + /** 样式属性(其他样式扩展) */ + private String cssClass; + + /** 表格字典样式 */ + private String listClass; + + /** 是否默认(Y是 N否) */ + @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") + private String isDefault; + + /** 状态(0正常 1停用) */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictCode() + { + return dictCode; + } + + public void setDictCode(Long dictCode) + { + this.dictCode = dictCode; + } + + public Long getDictSort() + { + return dictSort; + } + + public void setDictSort(Long dictSort) + { + this.dictSort = dictSort; + } + + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") + public String getDictLabel() + { + return dictLabel; + } + + public void setDictLabel(String dictLabel) + { + this.dictLabel = dictLabel; + } + + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") + public String getDictValue() + { + return dictValue; + } + + public void setDictValue(String dictValue) + { + this.dictValue = dictValue; + } + + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") + public String getCssClass() + { + return cssClass; + } + + public void setCssClass(String cssClass) + { + this.cssClass = cssClass; + } + + public String getListClass() + { + return listClass; + } + + public void setListClass(String listClass) + { + this.listClass = listClass; + } + + public boolean getDefault() + { + return UserConstants.YES.equals(this.isDefault); + } + + public String getIsDefault() + { + return isDefault; + } + + public void setIsDefault(String isDefault) + { + this.isDefault = isDefault; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictCode", getDictCode()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictType.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictType.java new file mode 100644 index 0000000..d17823c --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysDictType.java @@ -0,0 +1,96 @@ +package com.zeroerr.system.api.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 字典类型表 sys_dict_type + * + * @author ruoyi + */ +public class SysDictType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典主键 */ + @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) + private Long dictId; + + /** 字典名称 */ + @Excel(name = "字典名称") + private String dictName; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + + /** 状态(0正常 1停用) */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictId() + { + return dictId; + } + + public void setDictId(Long dictId) + { + this.dictId = dictId; + } + + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") + public String getDictName() + { + return dictName; + } + + public void setDictName(String dictName) + { + this.dictName = dictName; + } + + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") + @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)") + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictId", getDictId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysFile.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysFile.java new file mode 100644 index 0000000..2e30dd1 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysFile.java @@ -0,0 +1,50 @@ +package com.zeroerr.system.api.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 文件信息 + * + * @author ruoyi + */ +public class SysFile +{ + /** + * 文件名称 + */ + private String name; + + /** + * 文件地址 + */ + private String url; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("url", getUrl()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysLogininfor.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysLogininfor.java new file mode 100644 index 0000000..812e24b --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysLogininfor.java @@ -0,0 +1,102 @@ +package com.zeroerr.system.api.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 系统访问记录表 sys_logininfor + * + * @author ruoyi + */ +public class SysLogininfor extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "序号", cellType = ColumnType.NUMERIC) + private Long infoId; + + /** 用户账号 */ + @Excel(name = "用户账号") + private String userName; + + /** 状态 0成功 1失败 */ + @Excel(name = "状态", readConverterExp = "0=成功,1=失败") + private String status; + + /** 地址 */ + @Excel(name = "地址") + private String ipaddr; + + /** 描述 */ + @Excel(name = "描述") + private String msg; + + /** 访问时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date accessTime; + + public Long getInfoId() + { + return infoId; + } + + public void setInfoId(Long infoId) + { + this.infoId = infoId; + } + + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public Date getAccessTime() + { + return accessTime; + } + + public void setAccessTime(Date accessTime) + { + this.accessTime = accessTime; + } +} \ No newline at end of file diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysOperLog.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysOperLog.java new file mode 100644 index 0000000..83cb873 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysOperLog.java @@ -0,0 +1,255 @@ +package com.zeroerr.system.api.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 操作日志记录表 oper_log + * + * @author ruoyi + */ +public class SysOperLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 日志主键 */ + @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) + private Long operId; + + /** 操作模块 */ + @Excel(name = "操作模块") + private String title; + + /** 业务类型(0其它 1新增 2修改 3删除) */ + @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") + private Integer businessType; + + /** 业务类型数组 */ + private Integer[] businessTypes; + + /** 请求方法 */ + @Excel(name = "请求方法") + private String method; + + /** 请求方式 */ + @Excel(name = "请求方式") + private String requestMethod; + + /** 操作类别(0其它 1后台用户 2手机端用户) */ + @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") + private Integer operatorType; + + /** 操作人员 */ + @Excel(name = "操作人员") + private String operName; + + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + + /** 请求url */ + @Excel(name = "请求地址") + private String operUrl; + + /** 操作地址 */ + @Excel(name = "操作地址") + private String operIp; + + /** 请求参数 */ + @Excel(name = "请求参数") + private String operParam; + + /** 返回参数 */ + @Excel(name = "返回参数") + private String jsonResult; + + /** 操作状态(0正常 1异常) */ + @Excel(name = "状态", readConverterExp = "0=正常,1=异常") + private Integer status; + + /** 错误消息 */ + @Excel(name = "错误消息") + private String errorMsg; + + /** 操作时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date operTime; + + /** 消耗时间 */ + @Excel(name = "消耗时间", suffix = "毫秒") + private Long costTime; + + public Long getOperId() + { + return operId; + } + + public void setOperId(Long operId) + { + this.operId = operId; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public Integer getBusinessType() + { + return businessType; + } + + public void setBusinessType(Integer businessType) + { + this.businessType = businessType; + } + + public Integer[] getBusinessTypes() + { + return businessTypes; + } + + public void setBusinessTypes(Integer[] businessTypes) + { + this.businessTypes = businessTypes; + } + + public String getMethod() + { + return method; + } + + public void setMethod(String method) + { + this.method = method; + } + + public String getRequestMethod() + { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) + { + this.requestMethod = requestMethod; + } + + public Integer getOperatorType() + { + return operatorType; + } + + public void setOperatorType(Integer operatorType) + { + this.operatorType = operatorType; + } + + public String getOperName() + { + return operName; + } + + public void setOperName(String operName) + { + this.operName = operName; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getOperUrl() + { + return operUrl; + } + + public void setOperUrl(String operUrl) + { + this.operUrl = operUrl; + } + + public String getOperIp() + { + return operIp; + } + + public void setOperIp(String operIp) + { + this.operIp = operIp; + } + + public String getOperParam() + { + return operParam; + } + + public void setOperParam(String operParam) + { + this.operParam = operParam; + } + + public String getJsonResult() + { + return jsonResult; + } + + public void setJsonResult(String jsonResult) + { + this.jsonResult = jsonResult; + } + + public Integer getStatus() + { + return status; + } + + public void setStatus(Integer status) + { + this.status = status; + } + + public String getErrorMsg() + { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) + { + this.errorMsg = errorMsg; + } + + public Date getOperTime() + { + return operTime; + } + + public void setOperTime(Date operTime) + { + this.operTime = operTime; + } + + public Long getCostTime() + { + return costTime; + } + + public void setCostTime(Long costTime) + { + this.costTime = costTime; + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysRole.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysRole.java new file mode 100644 index 0000000..7211e70 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysRole.java @@ -0,0 +1,241 @@ +package com.zeroerr.system.api.domain; + +import java.util.Set; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 角色表 sys_role + * + * @author ruoyi + */ +public class SysRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 角色ID */ + @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) + private Long roleId; + + /** 角色名称 */ + @Excel(name = "角色名称") + private String roleName; + + /** 角色权限 */ + @Excel(name = "角色权限") + private String roleKey; + + /** 角色排序 */ + @Excel(name = "角色排序") + private Integer roleSort; + + /** 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) */ + @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") + private String dataScope; + + /** 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) */ + private boolean menuCheckStrictly; + + /** 部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 ) */ + private boolean deptCheckStrictly; + + /** 角色状态(0正常 1停用) */ + @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志(0代表存在 2代表删除) */ + private String delFlag; + + /** 用户是否存在此角色标识 默认不存在 */ + private boolean flag = false; + + /** 菜单组 */ + private Long[] menuIds; + + /** 部门组(数据权限) */ + private Long[] deptIds; + + /** 角色菜单权限 */ + private Set permissions; + + public SysRole() + { + + } + + public SysRole(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public boolean isAdmin() + { + return isAdmin(this.roleId); + } + + public static boolean isAdmin(Long roleId) + { + return roleId != null && 1L == roleId; + } + + @NotBlank(message = "角色名称不能为空") + @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") + public String getRoleName() + { + return roleName; + } + + public void setRoleName(String roleName) + { + this.roleName = roleName; + } + + @NotBlank(message = "权限字符不能为空") + @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") + public String getRoleKey() + { + return roleKey; + } + + public void setRoleKey(String roleKey) + { + this.roleKey = roleKey; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getRoleSort() + { + return roleSort; + } + + public void setRoleSort(Integer roleSort) + { + this.roleSort = roleSort; + } + + public String getDataScope() + { + return dataScope; + } + + public void setDataScope(String dataScope) + { + this.dataScope = dataScope; + } + + public boolean isMenuCheckStrictly() + { + return menuCheckStrictly; + } + + public void setMenuCheckStrictly(boolean menuCheckStrictly) + { + this.menuCheckStrictly = menuCheckStrictly; + } + + public boolean isDeptCheckStrictly() + { + return deptCheckStrictly; + } + + public void setDeptCheckStrictly(boolean deptCheckStrictly) + { + this.deptCheckStrictly = deptCheckStrictly; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + public Long[] getMenuIds() + { + return menuIds; + } + + public void setMenuIds(Long[] menuIds) + { + this.menuIds = menuIds; + } + + public Long[] getDeptIds() + { + return deptIds; + } + + public void setDeptIds(Long[] deptIds) + { + this.deptIds = deptIds; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("roleKey", getRoleKey()) + .append("roleSort", getRoleSort()) + .append("dataScope", getDataScope()) + .append("menuCheckStrictly", isMenuCheckStrictly()) + .append("deptCheckStrictly", isDeptCheckStrictly()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysUser.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysUser.java new file mode 100644 index 0000000..f9564f2 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/domain/SysUser.java @@ -0,0 +1,323 @@ +package com.zeroerr.system.api.domain; + +import java.util.Date; +import java.util.List; +import javax.validation.constraints.*; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.annotation.Excel.Type; +import com.zeroerr.common.core.annotation.Excels; +import com.zeroerr.common.core.web.domain.BaseEntity; +import com.zeroerr.common.core.xss.Xss; + +/** + * 用户对象 sys_user + * + * @author ruoyi + */ +public class SysUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") + private Long userId; + + /** 部门ID */ + @Excel(name = "部门编号", type = Type.IMPORT) + private Long deptId; + + /** 用户账号 */ + @Excel(name = "登录名称") + private String userName; + + /** 用户昵称 */ + @Excel(name = "用户名称") + private String nickName; + + /** 用户邮箱 */ + @Excel(name = "用户邮箱") + private String email; + + /** 手机号码 */ + @Excel(name = "手机号码", cellType = ColumnType.TEXT) + private String phonenumber; + + /** 用户性别 */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; + + /** 用户头像 */ + private String avatar; + + /** 密码 */ + private String password; + + /** 帐号状态(0正常 1停用) */ + @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志(0代表存在 2代表删除) */ + private String delFlag; + + /** 最后登录IP */ + @Excel(name = "最后登录IP", type = Type.EXPORT) + private String loginIp; + + /** 最后登录时间 */ + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) + private Date loginDate; + + /** 部门对象 */ + @Excels({ + @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) + }) + private SysDept dept; + + /** 角色对象 */ + private List roles; + + /** 角色组 */ + private Long[] roleIds; + + /** 岗位组 */ + private Long[] postIds; + + /** 角色ID */ + private Long roleId; + + public SysUser() + { + + } + + public SysUser(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public boolean isAdmin() + { + return isAdmin(this.userId); + } + + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + @Xss(message = "用户昵称不能包含脚本字符") + @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") + public String getNickName() + { + return nickName; + } + + public void setNickName(String nickName) + { + this.nickName = nickName; + } + + @Xss(message = "用户账号不能包含脚本字符") + @NotBlank(message = "用户账号不能为空") + @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") + public String getPhonenumber() + { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getSex() + { + return sex; + } + + public void setSex(String sex) + { + this.sex = sex; + } + + public String getAvatar() + { + return avatar; + } + + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getLoginIp() + { + return loginIp; + } + + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public Date getLoginDate() + { + return loginDate; + } + + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public SysDept getDept() + { + return dept; + } + + public void setDept(SysDept dept) + { + this.dept = dept; + } + + public List getRoles() + { + return roles; + } + + public void setRoles(List roles) + { + this.roles = roles; + } + + public Long[] getRoleIds() + { + return roleIds; + } + + public void setRoleIds(Long[] roleIds) + { + this.roleIds = roleIds; + } + + public Long[] getPostIds() + { + return postIds; + } + + public void setPostIds(Long[] postIds) + { + this.postIds = postIds; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("dept", getDept()) + .toString(); + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteFileFallbackFactory.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteFileFallbackFactory.java new file mode 100644 index 0000000..32b0320 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteFileFallbackFactory.java @@ -0,0 +1,35 @@ +package com.zeroerr.system.api.factory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.RemoteFileService; +import com.zeroerr.system.api.domain.SysFile; + +/** + * 文件服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemoteFileFallbackFactory implements FallbackFactory +{ + private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class); + + @Override + public RemoteFileService create(Throwable throwable) + { + log.error("文件服务调用失败:{}", throwable.getMessage()); + return new RemoteFileService() + { + @Override + public R upload(MultipartFile file) + { + return R.fail("上传文件失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteLogFallbackFactory.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteLogFallbackFactory.java new file mode 100644 index 0000000..75d3459 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteLogFallbackFactory.java @@ -0,0 +1,42 @@ +package com.zeroerr.system.api.factory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.RemoteLogService; +import com.zeroerr.system.api.domain.SysLogininfor; +import com.zeroerr.system.api.domain.SysOperLog; + +/** + * 日志服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemoteLogFallbackFactory implements FallbackFactory +{ + private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class); + + @Override + public RemoteLogService create(Throwable throwable) + { + log.error("日志服务调用失败:{}", throwable.getMessage()); + return new RemoteLogService() + { + @Override + public R saveLog(SysOperLog sysOperLog, String source) + { + return R.fail("保存操作日志失败:" + throwable.getMessage()); + } + + @Override + public R saveLogininfor(SysLogininfor sysLogininfor, String source) + { + return R.fail("保存登录日志失败:" + throwable.getMessage()); + } + }; + + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteUserFallbackFactory.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteUserFallbackFactory.java new file mode 100644 index 0000000..f29f6d7 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/factory/RemoteUserFallbackFactory.java @@ -0,0 +1,47 @@ +package com.zeroerr.system.api.factory; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.system.api.RemoteUserService; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 用户服务降级处理 + * + * @author ruoyi + */ +@Component +public class RemoteUserFallbackFactory implements FallbackFactory +{ + private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class); + + @Override + public RemoteUserService create(Throwable throwable) + { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new RemoteUserService() + { + @Override + public R getUserInfo(String username, String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R registerUserInfo(SysUser sysUser, String source) + { + return R.fail("注册用户失败:" + throwable.getMessage()); + } + + @Override + public R recordUserLogin(SysUser sysUser, String source) + { + return R.fail("记录用户登录信息失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/model/LoginUser.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/model/LoginUser.java new file mode 100644 index 0000000..e3ce599 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/model/LoginUser.java @@ -0,0 +1,163 @@ +package com.zeroerr.system.api.model; + +import java.io.Serializable; +import java.util.Set; +import com.zeroerr.system.api.domain.SysUser; + +/** + * 用户信息 + * + * @author ruoyi + */ +public class LoginUser implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** + * 用户唯一标识 + */ + private String token; + + /** + * 用户名id + */ + private Long userid; + + /** + * 部门id + */ + private Long deptId; + + /** + * 用户名 + */ + private String username; + + /** + * 登录时间 + */ + private Long loginTime; + + /** + * 过期时间 + */ + private Long expireTime; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 权限列表 + */ + private Set permissions; + + /** + * 角色列表 + */ + private Set roles; + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + /** + * 用户信息 + */ + private SysUser sysUser; + + public String getToken() + { + return token; + } + + public void setToken(String token) + { + this.token = token; + } + + public Long getUserid() + { + return userid; + } + + public void setUserid(Long userid) + { + this.userid = userid; + } + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public Long getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Long loginTime) + { + this.loginTime = loginTime; + } + + public Long getExpireTime() + { + return expireTime; + } + + public void setExpireTime(Long expireTime) + { + this.expireTime = expireTime; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + public Set getRoles() + { + return roles; + } + + public void setRoles(Set roles) + { + this.roles = roles; + } + + public SysUser getSysUser() + { + return sysUser; + } + + public void setSysUser(SysUser sysUser) + { + this.sysUser = sysUser; + } +} diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-api/zeroerroa-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8361101 --- /dev/null +++ b/zeroerroa-api/zeroerroa-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.zeroerr.system.api.factory.RemoteUserFallbackFactory +com.zeroerr.system.api.factory.RemoteLogFallbackFactory +com.zeroerr.system.api.factory.RemoteFileFallbackFactory diff --git a/zeroerroa-auth/pom.xml b/zeroerroa-auth/pom.xml new file mode 100644 index 0000000..a871b8c --- /dev/null +++ b/zeroerroa-auth/pom.xml @@ -0,0 +1,74 @@ + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + zeroerroa-auth + + + zeroerroa-auth认证授权中心 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.zeroerr + zeroerroa-common-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/ZeroErrAuthApplication.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/ZeroErrAuthApplication.java new file mode 100644 index 0000000..2aa295f --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/ZeroErrAuthApplication.java @@ -0,0 +1,31 @@ +package com.zeroerr.auth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import com.zeroerr.common.security.annotation.EnableRyFeignClients; + +/** + * 认证授权中心 + * + * @author ruoyi + */ +@EnableRyFeignClients +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class ZeroErrAuthApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrAuthApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 认证授权中心启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/controller/TokenController.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/controller/TokenController.java new file mode 100644 index 0000000..01813c1 --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/controller/TokenController.java @@ -0,0 +1,78 @@ +package com.zeroerr.auth.controller; + +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.auth.form.LoginBody; +import com.zeroerr.auth.form.RegisterBody; +import com.zeroerr.auth.service.SysLoginService; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.utils.JwtUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.auth.AuthUtil; +import com.zeroerr.common.security.service.TokenService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.model.LoginUser; + +/** + * token 控制 + * + * @author ruoyi + */ +@RestController +public class TokenController +{ + @Autowired + private TokenService tokenService; + + @Autowired + private SysLoginService sysLoginService; + + @PostMapping("login") + public R login(@RequestBody LoginBody form) + { + // 用户登录 + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + // 获取登录token + return R.ok(tokenService.createToken(userInfo)); + } + + @DeleteMapping("logout") + public R logout(HttpServletRequest request) + { + String token = SecurityUtils.getToken(request); + if (StringUtils.isNotEmpty(token)) + { + String username = JwtUtils.getUserName(token); + // 删除用户缓存记录 + AuthUtil.logoutByToken(token); + // 记录用户退出日志 + sysLoginService.logout(username); + } + return R.ok(); + } + + @PostMapping("refresh") + public R refresh(HttpServletRequest request) + { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser)) + { + // 刷新令牌有效期 + tokenService.refreshToken(loginUser); + return R.ok(); + } + return R.ok(); + } + + @PostMapping("register") + public R register(@RequestBody RegisterBody registerBody) + { + // 用户注册 + sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); + return R.ok(); + } +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/LoginBody.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/LoginBody.java new file mode 100644 index 0000000..3bd2090 --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/LoginBody.java @@ -0,0 +1,39 @@ +package com.zeroerr.auth.form; + +/** + * 用户登录对象 + * + * @author ruoyi + */ +public class LoginBody +{ + /** + * 用户名 + */ + private String username; + + /** + * 用户密码 + */ + private String password; + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/RegisterBody.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/RegisterBody.java new file mode 100644 index 0000000..2fd34a2 --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/form/RegisterBody.java @@ -0,0 +1,11 @@ +package com.zeroerr.auth.form; + +/** + * 用户注册对象 + * + * @author ruoyi + */ +public class RegisterBody extends LoginBody +{ + +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysLoginService.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysLoginService.java new file mode 100644 index 0000000..fc8b4fd --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysLoginService.java @@ -0,0 +1,161 @@ +package com.zeroerr.auth.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.enums.UserStatus; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.ip.IpUtils; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.RemoteUserService; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 登录校验方法 + * + * @author ruoyi + */ +@Component +public class SysLoginService +{ + @Autowired + private RemoteUserService remoteUserService; + + @Autowired + private SysPasswordService passwordService; + + @Autowired + private SysRecordLogService recordLogService; + + @Autowired + private RedisService redisService; + + /** + * 登录 + */ + public LoginUser login(String username, String password) + { + // 用户名或密码为空 错误 + if (StringUtils.isAnyBlank(username, password)) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写"); + throw new ServiceException("用户/密码必须填写"); + } + // 密码如果不在指定范围内 错误 + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围"); + throw new ServiceException("用户密码不在指定范围"); + } + // 用户名不在指定范围内 错误 + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围"); + throw new ServiceException("用户名不在指定范围"); + } + // IP黑名单校验 + String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST)); + if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾,访问IP已被列入系统黑名单"); + throw new ServiceException("很遗憾,访问IP已被列入系统黑名单"); + } + // 查询用户信息 + R userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + + if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); + throw new ServiceException("登录用户:" + username + " 不存在"); + } + + if (R.FAIL == userResult.getCode()) + { + throw new ServiceException(userResult.getMsg()); + } + + LoginUser userInfo = userResult.getData(); + SysUser user = userResult.getData().getSysUser(); + if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起,您的账号已被删除"); + throw new ServiceException("对不起,您的账号:" + username + " 已被删除"); + } + if (UserStatus.DISABLE.getCode().equals(user.getStatus())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用,请联系管理员"); + throw new ServiceException("对不起,您的账号:" + username + " 已停用"); + } + passwordService.validate(user, password); + recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); + recordLoginInfo(user.getUserId()); + return userInfo; + } + + /** + * 记录登录信息 + * + * @param userId 用户ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + // 更新用户登录IP + sysUser.setLoginIp(IpUtils.getIpAddr()); + // 更新用户登录时间 + sysUser.setLoginDate(DateUtils.getNowDate()); + remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER); + } + + public void logout(String loginName) + { + recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功"); + } + + /** + * 注册 + */ + public void register(String username, String password) + { + // 用户名或密码为空 错误 + if (StringUtils.isAnyBlank(username, password)) + { + throw new ServiceException("用户/密码必须填写"); + } + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + throw new ServiceException("账户长度必须在2到20个字符之间"); + } + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + throw new ServiceException("密码长度必须在5到20个字符之间"); + } + + // 注册用户信息 + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + sysUser.setNickName(username); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + R registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + + if (R.FAIL == registerResult.getCode()) + { + throw new ServiceException(registerResult.getMsg()); + } + recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); + } +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysPasswordService.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysPasswordService.java new file mode 100644 index 0000000..f96004d --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysPasswordService.java @@ -0,0 +1,85 @@ +package com.zeroerr.auth.service; + +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysUser; + +/** + * 登录密码方法 + * + * @author ruoyi + */ +@Component +public class SysPasswordService +{ + @Autowired + private RedisService redisService; + + private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT; + + private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME; + + @Autowired + private SysRecordLogService recordLogService; + + /** + * 登录账户密码错误次数缓存键名 + * + * @param username 用户名 + * @return 缓存键key + */ + private String getCacheKey(String username) + { + return CacheConstants.PWD_ERR_CNT_KEY + username; + } + + public void validate(SysUser user, String password) + { + String username = user.getUserName(); + + Integer retryCount = redisService.getCacheObject(getCacheKey(username)); + + if (retryCount == null) + { + retryCount = 0; + } + + if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) + { + String errMsg = String.format("密码输入错误%s次,帐户锁定%s分钟", maxRetryCount, lockTime); + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg); + throw new ServiceException(errMsg); + } + + if (!matches(user, password)) + { + retryCount = retryCount + 1; + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount)); + redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES); + throw new ServiceException("用户不存在/密码错误"); + } + else + { + clearLoginRecordCache(username); + } + } + + public boolean matches(SysUser user, String rawPassword) + { + return SecurityUtils.matchesPassword(rawPassword, user.getPassword()); + } + + public void clearLoginRecordCache(String loginName) + { + if (redisService.hasKey(getCacheKey(loginName))) + { + redisService.deleteObject(getCacheKey(loginName)); + } + } +} diff --git a/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysRecordLogService.java b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysRecordLogService.java new file mode 100644 index 0000000..b46c94d --- /dev/null +++ b/zeroerroa-auth/src/main/java/com/zeroerr/auth/service/SysRecordLogService.java @@ -0,0 +1,48 @@ +package com.zeroerr.auth.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.ip.IpUtils; +import com.zeroerr.system.api.RemoteLogService; +import com.zeroerr.system.api.domain.SysLogininfor; + +/** + * 记录日志方法 + * + * @author ruoyi + */ +@Component +public class SysRecordLogService +{ + @Autowired + private RemoteLogService remoteLogService; + + /** + * 记录登录信息 + * + * @param username 用户名 + * @param status 状态 + * @param message 消息内容 + * @return + */ + public void recordLogininfor(String username, String status, String message) + { + SysLogininfor logininfor = new SysLogininfor(); + logininfor.setUserName(username); + logininfor.setIpaddr(IpUtils.getIpAddr()); + logininfor.setMsg(message); + // 日志状态 + if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) + { + logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS); + } + else if (Constants.LOGIN_FAIL.equals(status)) + { + logininfor.setStatus(Constants.LOGIN_FAIL_STATUS); + } + remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER); + } +} diff --git a/zeroerroa-auth/src/main/resources/banner.txt b/zeroerroa-auth/src/main/resources/banner.txt new file mode 100644 index 0000000..97c5c27 --- /dev/null +++ b/zeroerroa-auth/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) | | | | + _ __ _ _ ___ _ _ _ ______ __ _ _ _ | |_ | |__ +| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ +| | | |_| || (_) || |_| || | | (_| || |_| || |_ | | | | +|_| \__,_| \___/ \__, ||_| \__,_| \__,_| \__||_| |_| + __/ | + |___/ \ No newline at end of file diff --git a/zeroerroa-auth/src/main/resources/bootstrap.yml b/zeroerroa-auth/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..0a41817 --- /dev/null +++ b/zeroerroa-auth/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9200 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-auth/src/main/resources/logback.xml b/zeroerroa-auth/src/main/resources/logback.xml new file mode 100644 index 0000000..f2e92df --- /dev/null +++ b/zeroerroa-auth/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-common/pom.xml b/zeroerroa-common/pom.xml new file mode 100644 index 0000000..3721fb2 --- /dev/null +++ b/zeroerroa-common/pom.xml @@ -0,0 +1,30 @@ + + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + + zeroerroa-common-log + zeroerroa-common-core + zeroerroa-common-redis + zeroerroa-common-seata + zeroerroa-common-swagger + zeroerroa-common-security + zeroerroa-common-sensitive + zeroerroa-common-datascope + zeroerroa-common-datasource + + + zeroerroa-common + pom + + + zeroerroa-common通用模块 + + + diff --git a/zeroerroa-common/zeroerroa-common-core/pom.xml b/zeroerroa-common/zeroerroa-common-core/pom.xml new file mode 100644 index 0000000..58d622b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/pom.xml @@ -0,0 +1,131 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-core + + + zeroerroa-common-core核心模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + com.alibaba + transmittable-thread-local + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + io.jsonwebtoken + jjwt + + + + + javax.xml.bind + jaxb-api + + + + + org.apache.commons + commons-lang3 + + + + + commons-io + commons-io + + + + + org.apache.poi + poi-ooxml + + + + + javax.servlet + javax.servlet-api + + + + + io.swagger + swagger-annotations + + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + org.projectlombok + lombok + + + + + diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excel.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excel.java new file mode 100644 index 0000000..94f3a00 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excel.java @@ -0,0 +1,187 @@ +package com.zeroerr.common.core.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.BigDecimal; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import com.zeroerr.common.core.utils.poi.ExcelHandlerAdapter; + +/** + * 自定义导出Excel数据注解 + * + * @author ruoyi + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Excel +{ + /** + * 导出时在excel中排序 + */ + public int sort() default Integer.MAX_VALUE; + + /** + * 导出到Excel中的名字. + */ + public String name() default ""; + + /** + * 日期格式, 如: yyyy-MM-dd + */ + public String dateFormat() default ""; + + /** + * 读取内容转表达式 (如: 0=男,1=女,2=未知) + */ + public String readConverterExp() default ""; + + /** + * 如果是字典类型,请设置字典的type值 (如: sys_user_sex) + */ + public String dictType() default ""; + + /** + * 分隔符,读取字符串组内容 + */ + public String separator() default ","; + + /** + * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) + */ + public int scale() default -1; + + /** + * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN + */ + public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; + + /** + * 导出时在excel中每个列的高度 + */ + public double height() default 14; + + /** + * 导出时在excel中每个列的宽度 + */ + public double width() default 16; + + /** + * 文字后缀,如% 90 变成90% + */ + public String suffix() default ""; + + /** + * 当值为空时,字段的默认值 + */ + public String defaultValue() default ""; + + /** + * 提示信息 + */ + public String prompt() default ""; + + /** + * 设置只能选择不能输入的列内容. + */ + public String[] combo() default {}; + + /** + * 是否需要纵向合并单元格,应对需求:含有list集合单元格) + */ + public boolean needMerge() default false; + + /** + * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. + */ + public boolean isExport() default true; + + /** + * 另一个类中的属性名称,支持多级获取,以小数点隔开 + */ + public String targetAttr() default ""; + + /** + * 是否自动统计数据,在最后追加一行统计数据总和 + */ + public boolean isStatistics() default false; + + /** + * 导出类型(0数字 1字符串) + */ + public ColumnType cellType() default ColumnType.STRING; + + /** + * 导出列头背景颜色 + */ + public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT; + + /** + * 导出列头字体颜色 + */ + public IndexedColors headerColor() default IndexedColors.WHITE; + + /** + * 导出单元格背景颜色 + */ + public IndexedColors backgroundColor() default IndexedColors.WHITE; + + /** + * 导出单元格字体颜色 + */ + public IndexedColors color() default IndexedColors.BLACK; + + /** + * 导出字段对齐方式 + */ + public HorizontalAlignment align() default HorizontalAlignment.CENTER; + + /** + * 自定义数据处理器 + */ + public Class handler() default ExcelHandlerAdapter.class; + + /** + * 自定义数据处理器参数 + */ + public String[] args() default {}; + + /** + * 字段类型(0:导出导入;1:仅导出;2:仅导入) + */ + Type type() default Type.ALL; + + public enum Type + { + ALL(0), EXPORT(1), IMPORT(2); + private final int value; + + Type(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } + + public enum ColumnType + { + NUMERIC(0), STRING(1), IMAGE(2), TEXT(3); + private final int value; + + ColumnType(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excels.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excels.java new file mode 100644 index 0000000..05a5fca --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/annotation/Excels.java @@ -0,0 +1,18 @@ +package com.zeroerr.common.core.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Excel注解集 + * + * @author ruoyi + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Excels +{ + Excel[] value(); +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/config/MybatisPlusConfig.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/config/MybatisPlusConfig.java new file mode 100644 index 0000000..57929d2 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/config/MybatisPlusConfig.java @@ -0,0 +1,63 @@ +package com.zeroerr.common.core.config; + + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * Mybatis Plus 配置 + * + * @author ruoyi + */ +@EnableTransactionManagement(proxyTargetClass = true) +@Configuration +public class MybatisPlusConfig +{ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() + { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + // 阻断插件 + interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); + return interceptor; + } + + /** + * 分页插件,自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html + */ + public PaginationInnerInterceptor paginationInnerInterceptor() + { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 设置数据库类型为mysql + paginationInnerInterceptor.setDbType(DbType.MYSQL); + // 设置最大单页限制数量,默认 500 条,-1 不受限制 + paginationInnerInterceptor.setMaxLimit(-1L); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() + { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 如果是对全表的删除或更新操作,就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html + */ + public BlockAttackInnerInterceptor blockAttackInnerInterceptor() + { + return new BlockAttackInnerInterceptor(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/CacheConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/CacheConstants.java new file mode 100644 index 0000000..1d18bd1 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/CacheConstants.java @@ -0,0 +1,59 @@ +package com.zeroerr.common.core.constant; + +/** + * 缓存常量信息 + * + * @author ruoyi + */ +public class CacheConstants +{ + /** + * 缓存有效期,默认720(分钟) + */ + public final static long EXPIRATION = 720; + + /** + * 缓存刷新时间,默认120(分钟) + */ + public final static long REFRESH_TIME = 120; + + /** + * 密码最大错误次数 + */ + public final static int PASSWORD_MAX_RETRY_COUNT = 5; + + /** + * 密码锁定时间,默认10(分钟) + */ + public final static long PASSWORD_LOCK_TIME = 10; + + /** + * 权限缓存前缀 + */ + public final static String LOGIN_TOKEN_KEY = "login_tokens:"; + + /** + * 验证码 redis key + */ + public static final String CAPTCHA_CODE_KEY = "captcha_codes:"; + + /** + * 参数管理 cache key + */ + public static final String SYS_CONFIG_KEY = "sys_config:"; + + /** + * 字典管理 cache key + */ + public static final String SYS_DICT_KEY = "sys_dict:"; + + /** + * 登录账户密码错误次数 redis key + */ + public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:"; + + /** + * 登录IP黑名单 cache key + */ + public static final String SYS_LOGIN_BLACKIPLIST = SYS_CONFIG_KEY + "sys.login.blackIPList"; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/Constants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/Constants.java new file mode 100644 index 0000000..7a934e7 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/Constants.java @@ -0,0 +1,135 @@ +package com.zeroerr.common.core.constant; + +/** + * 通用常量信息 + * + * @author ruoyi + */ +public class Constants +{ + /** + * UTF-8 字符集 + */ + public static final String UTF8 = "UTF-8"; + + /** + * GBK 字符集 + */ + public static final String GBK = "GBK"; + + /** + * www主域 + */ + public static final String WWW = "www."; + + /** + * RMI 远程方法调用 + */ + public static final String LOOKUP_RMI = "rmi:"; + + /** + * LDAP 远程方法调用 + */ + public static final String LOOKUP_LDAP = "ldap:"; + + /** + * LDAPS 远程方法调用 + */ + public static final String LOOKUP_LDAPS = "ldaps:"; + + /** + * http请求 + */ + public static final String HTTP = "http://"; + + /** + * https请求 + */ + public static final String HTTPS = "https://"; + + /** + * 成功标记 + */ + public static final Integer SUCCESS = 200; + + /** + * 失败标记 + */ + public static final Integer FAIL = 500; + + /** + * 登录成功状态 + */ + public static final String LOGIN_SUCCESS_STATUS = "0"; + + /** + * 登录失败状态 + */ + public static final String LOGIN_FAIL_STATUS = "1"; + + /** + * 登录成功 + */ + public static final String LOGIN_SUCCESS = "Success"; + + /** + * 注销 + */ + public static final String LOGOUT = "Logout"; + + /** + * 注册 + */ + public static final String REGISTER = "Register"; + + /** + * 登录失败 + */ + public static final String LOGIN_FAIL = "Error"; + + /** + * 当前记录起始索引 + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页显示记录数 + */ + public static final String PAGE_SIZE = "pageSize"; + + /** + * 排序列 + */ + public static final String ORDER_BY_COLUMN = "orderByColumn"; + + /** + * 排序的方向 "desc" 或者 "asc". + */ + public static final String IS_ASC = "isAsc"; + + /** + * 验证码有效期(分钟) + */ + public static final long CAPTCHA_EXPIRATION = 2; + + /** + * 资源映射路径 前缀 + */ + public static final String RESOURCE_PREFIX = "/profile"; + + /** + * 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全) + */ + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.zeroerr" }; + + /** + * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加) + */ + public static final String[] JOB_WHITELIST_STR = { "com.zeroerr.job.task" }; + + /** + * 定时任务违规的字符 + */ + public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.zeroerr.common.core.utils.file" }; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/GenConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/GenConstants.java new file mode 100644 index 0000000..3e6a889 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/GenConstants.java @@ -0,0 +1,117 @@ +package com.zeroerr.common.core.constant; + +/** + * 代码生成通用常量 + * + * @author ruoyi + */ +public class GenConstants +{ + /** 单表(增删改查) */ + public static final String TPL_CRUD = "crud"; + + /** 树表(增删改查) */ + public static final String TPL_TREE = "tree"; + + /** 主子表(增删改查) */ + public static final String TPL_SUB = "sub"; + + /** 树编码字段 */ + public static final String TREE_CODE = "treeCode"; + + /** 树父编码字段 */ + public static final String TREE_PARENT_CODE = "treeParentCode"; + + /** 树名称字段 */ + public static final String TREE_NAME = "treeName"; + + /** 上级菜单ID字段 */ + public static final String PARENT_MENU_ID = "parentMenuId"; + + /** 上级菜单名称字段 */ + public static final String PARENT_MENU_NAME = "parentMenuName"; + + /** 数据库字符串类型 */ + public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; + + /** 数据库文本类型 */ + public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; + + /** 数据库时间类型 */ + public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; + + /** 数据库数字类型 */ + public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", + "bit", "bigint", "float", "double", "decimal" }; + + /** 页面不需要编辑字段 */ + public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; + + /** 页面不需要显示的列表字段 */ + public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", + "update_time" }; + + /** 页面不需要查询字段 */ + public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", + "update_time", "remark" }; + + /** Entity基类字段 */ + public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" }; + + /** Tree基类字段 */ + public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" }; + + /** 文本框 */ + public static final String HTML_INPUT = "input"; + + /** 文本域 */ + public static final String HTML_TEXTAREA = "textarea"; + + /** 下拉框 */ + public static final String HTML_SELECT = "select"; + + /** 单选框 */ + public static final String HTML_RADIO = "radio"; + + /** 复选框 */ + public static final String HTML_CHECKBOX = "checkbox"; + + /** 日期控件 */ + public static final String HTML_DATETIME = "datetime"; + + /** 图片上传控件 */ + public static final String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** 文件上传控件 */ + public static final String HTML_FILE_UPLOAD = "fileUpload"; + + /** 富文本控件 */ + public static final String HTML_EDITOR = "editor"; + + /** 字符串类型 */ + public static final String TYPE_STRING = "String"; + + /** 整型 */ + public static final String TYPE_INTEGER = "Integer"; + + /** 长整型 */ + public static final String TYPE_LONG = "Long"; + + /** 浮点型 */ + public static final String TYPE_DOUBLE = "Double"; + + /** 高精度计算类型 */ + public static final String TYPE_BIGDECIMAL = "BigDecimal"; + + /** 时间类型 */ + public static final String TYPE_DATE = "Date"; + + /** 模糊查询 */ + public static final String QUERY_LIKE = "LIKE"; + + /** 相等查询 */ + public static final String QUERY_EQ = "EQ"; + + /** 需要 */ + public static final String REQUIRE = "1"; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/HttpStatus.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/HttpStatus.java new file mode 100644 index 0000000..2b1fbb1 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/HttpStatus.java @@ -0,0 +1,94 @@ +package com.zeroerr.common.core.constant; + +/** + * 返回状态码 + * + * @author ruoyi + */ +public class HttpStatus +{ + /** + * 操作成功 + */ + public static final int SUCCESS = 200; + + /** + * 对象创建成功 + */ + public static final int CREATED = 201; + + /** + * 请求已经被接受 + */ + public static final int ACCEPTED = 202; + + /** + * 操作已经执行成功,但是没有返回数据 + */ + public static final int NO_CONTENT = 204; + + /** + * 资源已被移除 + */ + public static final int MOVED_PERM = 301; + + /** + * 重定向 + */ + public static final int SEE_OTHER = 303; + + /** + * 资源没有被修改 + */ + public static final int NOT_MODIFIED = 304; + + /** + * 参数列表错误(缺少,格式不匹配) + */ + public static final int BAD_REQUEST = 400; + + /** + * 未授权 + */ + public static final int UNAUTHORIZED = 401; + + /** + * 访问受限,授权过期 + */ + public static final int FORBIDDEN = 403; + + /** + * 资源,服务未找到 + */ + public static final int NOT_FOUND = 404; + + /** + * 不允许的http方法 + */ + public static final int BAD_METHOD = 405; + + /** + * 资源冲突,或者资源被锁 + */ + public static final int CONFLICT = 409; + + /** + * 不支持的数据,媒体类型 + */ + public static final int UNSUPPORTED_TYPE = 415; + + /** + * 系统内部错误 + */ + public static final int ERROR = 500; + + /** + * 接口未实现 + */ + public static final int NOT_IMPLEMENTED = 501; + + /** + * 系统警告消息 + */ + public static final int WARN = 601; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ScheduleConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ScheduleConstants.java new file mode 100644 index 0000000..c452895 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ScheduleConstants.java @@ -0,0 +1,50 @@ +package com.zeroerr.common.core.constant; + +/** + * 任务调度通用常量 + * + * @author ruoyi + */ +public class ScheduleConstants +{ + public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; + + /** 执行目标key */ + public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; + + /** 默认 */ + public static final String MISFIRE_DEFAULT = "0"; + + /** 立即触发执行 */ + public static final String MISFIRE_IGNORE_MISFIRES = "1"; + + /** 触发一次执行 */ + public static final String MISFIRE_FIRE_AND_PROCEED = "2"; + + /** 不触发立即执行 */ + public static final String MISFIRE_DO_NOTHING = "3"; + + public enum Status + { + /** + * 正常 + */ + NORMAL("0"), + /** + * 暂停 + */ + PAUSE("1"); + + private String value; + + private Status(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/SecurityConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/SecurityConstants.java new file mode 100644 index 0000000..59d1a3b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/SecurityConstants.java @@ -0,0 +1,49 @@ +package com.zeroerr.common.core.constant; + +/** + * 权限相关通用常量 + * + * @author ruoyi + */ +public class SecurityConstants +{ + /** + * 用户ID字段 + */ + public static final String DETAILS_USER_ID = "user_id"; + + /** + * 用户名字段 + */ + public static final String DETAILS_USERNAME = "username"; + + /** + * 授权信息字段 + */ + public static final String AUTHORIZATION_HEADER = "authorization"; + + /** + * 请求来源 + */ + public static final String FROM_SOURCE = "from-source"; + + /** + * 内部请求 + */ + public static final String INNER = "inner"; + + /** + * 用户标识 + */ + public static final String USER_KEY = "user_key"; + + /** + * 登录用户 + */ + public static final String LOGIN_USER = "login_user"; + + /** + * 角色权限 + */ + public static final String ROLE_PERMISSION = "role_permission"; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ServiceNameConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ServiceNameConstants.java new file mode 100644 index 0000000..1508d05 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/ServiceNameConstants.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.core.constant; + +/** + * 服务名称 + * + * @author ruoyi + */ +public class ServiceNameConstants +{ + /** + * 认证服务的serviceid + */ + public static final String AUTH_SERVICE = "zeroerroa-auth"; + + /** + * 系统模块的serviceid + */ + public static final String SYSTEM_SERVICE = "zeroerroa-system"; + + /** + * 文件服务的serviceid + */ + public static final String FILE_SERVICE = "zeroerroa-file"; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/TokenConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/TokenConstants.java new file mode 100644 index 0000000..d43b92e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/TokenConstants.java @@ -0,0 +1,25 @@ +package com.zeroerr.common.core.constant; + +/** + * Token的Key常量 + * + * @author ruoyi + */ +public class TokenConstants +{ + /** + * 令牌自定义标识 + */ + public static final String AUTHENTICATION = "Authorization"; + + /** + * 令牌前缀 + */ + public static final String PREFIX = "Bearer "; + + /** + * 令牌秘钥 + */ + public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; + +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/UserConstants.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/UserConstants.java new file mode 100644 index 0000000..ae8b091 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/constant/UserConstants.java @@ -0,0 +1,80 @@ +package com.zeroerr.common.core.constant; + +/** + * 用户常量信息 + * + * @author ruoyi + */ +public class UserConstants +{ + /** + * 平台内系统用户的唯一标志 + */ + public static final String SYS_USER = "SYS_USER"; + + /** 正常状态 */ + public static final String NORMAL = "0"; + + /** 异常状态 */ + public static final String EXCEPTION = "1"; + + /** 用户封禁状态 */ + public static final String USER_DISABLE = "1"; + + /** 角色封禁状态 */ + public static final String ROLE_DISABLE = "1"; + + /** 部门正常状态 */ + public static final String DEPT_NORMAL = "0"; + + /** 部门停用状态 */ + public static final String DEPT_DISABLE = "1"; + + /** 字典正常状态 */ + public static final String DICT_NORMAL = "0"; + + /** 是否为系统默认(是) */ + public static final String YES = "Y"; + + /** 是否菜单外链(是) */ + public static final String YES_FRAME = "0"; + + /** 是否菜单外链(否) */ + public static final String NO_FRAME = "1"; + + /** 菜单类型(目录) */ + public static final String TYPE_DIR = "M"; + + /** 菜单类型(菜单) */ + public static final String TYPE_MENU = "C"; + + /** 菜单类型(按钮) */ + public static final String TYPE_BUTTON = "F"; + + /** Layout组件标识 */ + public final static String LAYOUT = "Layout"; + + /** ParentView组件标识 */ + public final static String PARENT_VIEW = "ParentView"; + + /** InnerLink组件标识 */ + public final static String INNER_LINK = "InnerLink"; + + /** 校验是否唯一的返回标识 */ + public final static boolean UNIQUE = true; + public final static boolean NOT_UNIQUE = false; + + /** + * 用户名长度限制 + */ + public static final int USERNAME_MIN_LENGTH = 2; + + public static final int USERNAME_MAX_LENGTH = 20; + + /** + * 密码长度限制 + */ + public static final int PASSWORD_MIN_LENGTH = 5; + + public static final int PASSWORD_MAX_LENGTH = 20; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/context/SecurityContextHolder.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/context/SecurityContextHolder.java new file mode 100644 index 0000000..ac715de --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/context/SecurityContextHolder.java @@ -0,0 +1,98 @@ +package com.zeroerr.common.core.context; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import com.alibaba.ttl.TransmittableThreadLocal; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 获取当前线程变量中的 用户id、用户名称、Token等信息 + * 注意: 必须在网关通过请求头的方法传入,同时在HeaderInterceptor拦截器设置值。 否则这里无法获取 + * + * @author ruoyi + */ +public class SecurityContextHolder +{ + private static final TransmittableThreadLocal> THREAD_LOCAL = new TransmittableThreadLocal<>(); + + public static void set(String key, Object value) + { + Map map = getLocalMap(); + map.put(key, value == null ? StringUtils.EMPTY : value); + } + + public static String get(String key) + { + Map map = getLocalMap(); + return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY)); + } + + public static T get(String key, Class clazz) + { + Map map = getLocalMap(); + return StringUtils.cast(map.getOrDefault(key, null)); + } + + public static Map getLocalMap() + { + Map map = THREAD_LOCAL.get(); + if (map == null) + { + map = new ConcurrentHashMap(); + THREAD_LOCAL.set(map); + } + return map; + } + + public static void setLocalMap(Map threadLocalMap) + { + THREAD_LOCAL.set(threadLocalMap); + } + + public static Long getUserId() + { + return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L); + } + + public static void setUserId(String account) + { + set(SecurityConstants.DETAILS_USER_ID, account); + } + + public static String getUserName() + { + return get(SecurityConstants.DETAILS_USERNAME); + } + + public static void setUserName(String username) + { + set(SecurityConstants.DETAILS_USERNAME, username); + } + + public static String getUserKey() + { + return get(SecurityConstants.USER_KEY); + } + + public static void setUserKey(String userKey) + { + set(SecurityConstants.USER_KEY, userKey); + } + + public static String getPermission() + { + return get(SecurityConstants.ROLE_PERMISSION); + } + + public static void setPermission(String permissions) + { + set(SecurityConstants.ROLE_PERMISSION, permissions); + } + + public static void remove() + { + THREAD_LOCAL.remove(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/domain/R.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/domain/R.java new file mode 100644 index 0000000..51e1e4f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/domain/R.java @@ -0,0 +1,115 @@ +package com.zeroerr.common.core.domain; + +import java.io.Serializable; +import com.zeroerr.common.core.constant.Constants; + +/** + * 响应信息主体 + * + * @author ruoyi + */ +public class R implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 成功 */ + public static final int SUCCESS = Constants.SUCCESS; + + /** 失败 */ + public static final int FAIL = Constants.FAIL; + + private int code; + + private String msg; + + private T data; + + public static R ok() + { + return restResult(null, SUCCESS, null); + } + + public static R ok(T data) + { + return restResult(data, SUCCESS, null); + } + + public static R ok(T data, String msg) + { + return restResult(data, SUCCESS, msg); + } + + public static R fail() + { + return restResult(null, FAIL, null); + } + + public static R fail(String msg) + { + return restResult(null, FAIL, msg); + } + + public static R fail(T data) + { + return restResult(data, FAIL, null); + } + + public static R fail(T data, String msg) + { + return restResult(data, FAIL, msg); + } + + public static R fail(int code, String msg) + { + return restResult(null, code, msg); + } + + private static R restResult(T data, int code, String msg) + { + R apiResult = new R<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } + + public int getCode() + { + return code; + } + + public void setCode(int code) + { + this.code = code; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public T getData() + { + return data; + } + + public void setData(T data) + { + this.data = data; + } + + public static Boolean isError(R ret) + { + return !isSuccess(ret); + } + + public static Boolean isSuccess(R ret) + { + return R.SUCCESS == ret.getCode(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessAction.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessAction.java new file mode 100644 index 0000000..703019d --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessAction.java @@ -0,0 +1,41 @@ +package com.zeroerr.common.core.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; + +/** + * @author huang.js + * @since 2022/12/8 11:39 + */ +public enum ProcessAction implements IEnum { + // ProcessTaskNodeActionEnum 流程动作:apply->申请;audit->审批;cc->审批;transport->运输; + apply("申请"), + audit("审批"), + cc("抄送"), + edit("修改") + ; + private String text; + + ProcessAction(String text) { + this.text = text; + } + public String getText() { + return text; + } + @Override + public String getValue() { + return this.name(); + } + + public static ProcessAction get(String name) { + for (ProcessAction value : values()) { + if (value.name().equals(name)) { + return value; + } + } + return null; + } + + public boolean isEquals(String name) { + return name().equals(name); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessResult.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessResult.java new file mode 100644 index 0000000..510e1ac --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessResult.java @@ -0,0 +1,36 @@ +package com.zeroerr.common.core.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; + +/** + * @author lw + * @since 2024/5/18 11:39 + */ +public enum ProcessResult implements IEnum { + // ProcessResultEnum 审批结果:approved->同意;refused->驳回; + approved("同意"), + repulse("打回"), + refused("拒绝"), + ; + private String text; + + ProcessResult(String text) { + this.text = text; + } + public String getText() { + return text; + } + @Override + public String getValue() { + return this.name(); + } + + public static ProcessResult get(String name) { + for (ProcessResult value : values()) { + if (value.name().equals(name)) { + return value; + } + } + return null; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskNodeStatus.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskNodeStatus.java new file mode 100644 index 0000000..459840c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskNodeStatus.java @@ -0,0 +1,36 @@ +package com.zeroerr.common.core.enums; + +public enum ProcessTaskNodeStatus { + + ready("准备中"), + process("正在处理"), + complete("处理完成"), + cancel("取消"), + ; + private String text; + + ProcessTaskNodeStatus(String text) { + this.text = text; + } + + public String getText() { + return text; + } + + public String getValue() { + return this.name(); + } + + public static ProcessTaskNodeStatus get(String name) { + for (ProcessTaskNodeStatus value : values()) { + if (value.name().equals(name)) { + return value; + } + } + return null; + } + + public boolean isEquals(String name) { + return name().equals(name); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskStatus.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskStatus.java new file mode 100644 index 0000000..cba82e1 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/ProcessTaskStatus.java @@ -0,0 +1,42 @@ +package com.zeroerr.common.core.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; + +/** + * @author huang.js + * @since 2022/12/8 11:39 + */ +public enum ProcessTaskStatus implements IEnum { + // LeaveFormStatusEnum 状态:process->审批中;cancel->撤销;approved->通过;refused->驳回;pause->暂缓; + process("审批中"), + cancel("撤销"), + approved("通过"), + refused("驳回"), + pause("暂停"), + reapply("重申") + ; + private String text; + + ProcessTaskStatus(String text) { + this.text = text; + } + public String getText() { + return text; + } + @Override + public String getValue() { + return this.name(); + } + + public static ProcessTaskStatus get(String name) { + for (ProcessTaskStatus value : values()) { + if (value.name().equals(name)) { + return value; + } + } + return null; + } + public boolean isEquals(String name) { + return name().equals(name); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/RecruitEnum.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/RecruitEnum.java new file mode 100644 index 0000000..0c59701 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/RecruitEnum.java @@ -0,0 +1,40 @@ +package com.zeroerr.common.core.enums; + +/** + * 考勤组 补卡时间 0不限制 1一天内 2一周内 3一个月内 + * Created by chris on 2022-10-06. + */ +public enum RecruitEnum { + + /** + * 正在招聘中 + */ + RECRUITING(0, "正在招聘中"), + /** + * 已完成招聘 + */ + HAVE_RECRUITED(1, "已完成招聘"), + /** + * 取消招聘 + */ + CANCEL_RECRUITED(2,"取消招聘"); + + private Integer value; + private String name; + + RecruitEnum(Integer value, String name) { + this.value = value; + this.name = name; + } + + public Integer getValue() { + return value; + } + public String getName() { + return name; + } + + public void setValue(Integer value) { + this.value = value; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/UserStatus.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/UserStatus.java new file mode 100644 index 0000000..ac2f2a3 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/enums/UserStatus.java @@ -0,0 +1,30 @@ +package com.zeroerr.common.core.enums; + +/** + * 用户状态 + * + * @author ruoyi + */ +public enum UserStatus +{ + OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); + + private final String code; + private final String info; + + UserStatus(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CaptchaException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CaptchaException.java new file mode 100644 index 0000000..3cdf48b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CaptchaException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception; + +/** + * 验证码错误异常类 + * + * @author ruoyi + */ +public class CaptchaException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public CaptchaException(String msg) + { + super(msg); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CheckedException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CheckedException.java new file mode 100644 index 0000000..d8319b2 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/CheckedException.java @@ -0,0 +1,31 @@ +package com.zeroerr.common.core.exception; + +/** + * 检查异常 + * + * @author ruoyi + */ +public class CheckedException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public CheckedException(String message) + { + super(message); + } + + public CheckedException(Throwable cause) + { + super(cause); + } + + public CheckedException(String message, Throwable cause) + { + super(message, cause); + } + + public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) + { + super(message, cause, enableSuppression, writableStackTrace); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/DemoModeException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/DemoModeException.java new file mode 100644 index 0000000..de43821 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/DemoModeException.java @@ -0,0 +1,15 @@ +package com.zeroerr.common.core.exception; + +/** + * 演示模式异常 + * + * @author ruoyi + */ +public class DemoModeException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public DemoModeException() + { + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/GlobalException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/GlobalException.java new file mode 100644 index 0000000..fb4bc96 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/GlobalException.java @@ -0,0 +1,58 @@ +package com.zeroerr.common.core.exception; + +/** + * 全局异常 + * + * @author ruoyi + */ +public class GlobalException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细,内部调试错误 + * + * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法,避免反序列化问题 + */ + public GlobalException() + { + } + + public GlobalException(String message) + { + this.message = message; + } + + public String getDetailMessage() + { + return detailMessage; + } + + public GlobalException setDetailMessage(String detailMessage) + { + this.detailMessage = detailMessage; + return this; + } + + @Override + public String getMessage() + { + return message; + } + + public GlobalException setMessage(String message) + { + this.message = message; + return this; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/InnerAuthException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/InnerAuthException.java new file mode 100644 index 0000000..c47bc1e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/InnerAuthException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception; + +/** + * 内部认证异常 + * + * @author ruoyi + */ +public class InnerAuthException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public InnerAuthException(String message) + { + super(message); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/PreAuthorizeException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/PreAuthorizeException.java new file mode 100644 index 0000000..874727c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/PreAuthorizeException.java @@ -0,0 +1,15 @@ +package com.zeroerr.common.core.exception; + +/** + * 权限异常 + * + * @author ruoyi + */ +public class PreAuthorizeException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public PreAuthorizeException() + { + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/ServiceException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/ServiceException.java new file mode 100644 index 0000000..174fb40 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/ServiceException.java @@ -0,0 +1,74 @@ +package com.zeroerr.common.core.exception; + +/** + * 业务异常 + * + * @author ruoyi + */ +public final class ServiceException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细,内部调试错误 + * + * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法,避免反序列化问题 + */ + public ServiceException() + { + } + + public ServiceException(String message) + { + this.message = message; + } + + public ServiceException(String message, Integer code) + { + this.message = message; + this.code = code; + } + + public String getDetailMessage() + { + return detailMessage; + } + + @Override + public String getMessage() + { + return message; + } + + public Integer getCode() + { + return code; + } + + public ServiceException setMessage(String message) + { + this.message = message; + return this; + } + + public ServiceException setDetailMessage(String detailMessage) + { + this.detailMessage = detailMessage; + return this; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/UtilException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/UtilException.java new file mode 100644 index 0000000..a1a8580 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/UtilException.java @@ -0,0 +1,26 @@ +package com.zeroerr.common.core.exception; + +/** + * 工具类异常 + * + * @author ruoyi + */ +public class UtilException extends RuntimeException +{ + private static final long serialVersionUID = 8247610319171014183L; + + public UtilException(Throwable e) + { + super(e.getMessage(), e); + } + + public UtilException(String message) + { + super(message); + } + + public UtilException(String message, Throwable throwable) + { + super(message, throwable); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotLoginException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotLoginException.java new file mode 100644 index 0000000..821df61 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotLoginException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception.auth; + +/** + * 未能通过的登录认证异常 + * + * @author ruoyi + */ +public class NotLoginException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public NotLoginException(String message) + { + super(message); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotPermissionException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotPermissionException.java new file mode 100644 index 0000000..46b06b0 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotPermissionException.java @@ -0,0 +1,23 @@ +package com.zeroerr.common.core.exception.auth; + +import org.apache.commons.lang3.StringUtils; + +/** + * 未能通过的权限认证异常 + * + * @author ruoyi + */ +public class NotPermissionException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public NotPermissionException(String permission) + { + super(permission); + } + + public NotPermissionException(String[] permissions) + { + super(StringUtils.join(permissions, ",")); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotRoleException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotRoleException.java new file mode 100644 index 0000000..b2cf519 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/auth/NotRoleException.java @@ -0,0 +1,23 @@ +package com.zeroerr.common.core.exception.auth; + +import org.apache.commons.lang3.StringUtils; + +/** + * 未能通过的角色认证异常 + * + * @author ruoyi + */ +public class NotRoleException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public NotRoleException(String role) + { + super(role); + } + + public NotRoleException(String[] roles) + { + super(StringUtils.join(roles, ",")); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/base/BaseException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/base/BaseException.java new file mode 100644 index 0000000..2c1ebfc --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/base/BaseException.java @@ -0,0 +1,79 @@ +package com.zeroerr.common.core.exception.base; + +/** + * 基础异常 + * + * @author ruoyi + */ +public class BaseException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 所属模块 + */ + private String module; + + /** + * 错误码 + */ + private String code; + + /** + * 错误码对应的参数 + */ + private Object[] args; + + /** + * 错误消息 + */ + private String defaultMessage; + + public BaseException(String module, String code, Object[] args, String defaultMessage) + { + this.module = module; + this.code = code; + this.args = args; + this.defaultMessage = defaultMessage; + } + + public BaseException(String module, String code, Object[] args) + { + this(module, code, args, null); + } + + public BaseException(String module, String defaultMessage) + { + this(module, null, null, defaultMessage); + } + + public BaseException(String code, Object[] args) + { + this(null, code, args, null); + } + + public BaseException(String defaultMessage) + { + this(null, null, null, defaultMessage); + } + + public String getModule() + { + return module; + } + + public String getCode() + { + return code; + } + + public Object[] getArgs() + { + return args; + } + + public String getDefaultMessage() + { + return defaultMessage; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileException.java new file mode 100644 index 0000000..4d6b13e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileException.java @@ -0,0 +1,19 @@ +package com.zeroerr.common.core.exception.file; + +import com.zeroerr.common.core.exception.base.BaseException; + +/** + * 文件信息异常类 + * + * @author ruoyi + */ +public class FileException extends BaseException +{ + private static final long serialVersionUID = 1L; + + public FileException(String code, Object[] args, String msg) + { + super("file", code, args, msg); + } + +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileNameLengthLimitExceededException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileNameLengthLimitExceededException.java new file mode 100644 index 0000000..1dd4708 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception.file; + +/** + * 文件名称超长限制异常类 + * + * @author ruoyi + */ +public class FileNameLengthLimitExceededException extends FileException +{ + private static final long serialVersionUID = 1L; + + public FileNameLengthLimitExceededException(int defaultFileNameLength) + { + super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "the filename is too long"); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileSizeLimitExceededException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileSizeLimitExceededException.java new file mode 100644 index 0000000..0deec11 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileSizeLimitExceededException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception.file; + +/** + * 文件名大小限制异常类 + * + * @author ruoyi + */ +public class FileSizeLimitExceededException extends FileException +{ + private static final long serialVersionUID = 1L; + + public FileSizeLimitExceededException(long defaultMaxSize) + { + super("upload.exceed.maxSize", new Object[] { defaultMaxSize }, "the filesize is too large"); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileUploadException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileUploadException.java new file mode 100644 index 0000000..004763c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/FileUploadException.java @@ -0,0 +1,61 @@ +package com.zeroerr.common.core.exception.file; + +import java.io.PrintStream; +import java.io.PrintWriter; + +/** + * 文件上传异常类 + * + * @author ruoyi + */ +public class FileUploadException extends Exception +{ + + private static final long serialVersionUID = 1L; + + private final Throwable cause; + + public FileUploadException() + { + this(null, null); + } + + public FileUploadException(final String msg) + { + this(msg, null); + } + + public FileUploadException(String msg, Throwable cause) + { + super(msg); + this.cause = cause; + } + + @Override + public void printStackTrace(PrintStream stream) + { + super.printStackTrace(stream); + if (cause != null) + { + stream.println("Caused by:"); + cause.printStackTrace(stream); + } + } + + @Override + public void printStackTrace(PrintWriter writer) + { + super.printStackTrace(writer); + if (cause != null) + { + writer.println("Caused by:"); + cause.printStackTrace(writer); + } + } + + @Override + public Throwable getCause() + { + return cause; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/InvalidExtensionException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/InvalidExtensionException.java new file mode 100644 index 0000000..c875f9f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/file/InvalidExtensionException.java @@ -0,0 +1,80 @@ +package com.zeroerr.common.core.exception.file; + +import java.util.Arrays; + +/** + * 文件上传 误异常类 + * + * @author ruoyi + */ +public class InvalidExtensionException extends FileUploadException +{ + private static final long serialVersionUID = 1L; + + private String[] allowedExtension; + private String extension; + private String filename; + + public InvalidExtensionException(String[] allowedExtension, String extension, String filename) + { + super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); + this.allowedExtension = allowedExtension; + this.extension = extension; + this.filename = filename; + } + + public String[] getAllowedExtension() + { + return allowedExtension; + } + + public String getExtension() + { + return extension; + } + + public String getFilename() + { + return filename; + } + + public static class InvalidImageExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidFlashExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidMediaExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidVideoExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/job/TaskException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/job/TaskException.java new file mode 100644 index 0000000..ff375cb --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/job/TaskException.java @@ -0,0 +1,34 @@ +package com.zeroerr.common.core.exception.job; + +/** + * 计划策略异常 + * + * @author ruoyi + */ +public class TaskException extends Exception +{ + private static final long serialVersionUID = 1L; + + private Code code; + + public TaskException(String msg, Code code) + { + this(msg, code, null); + } + + public TaskException(String msg, Code code, Exception nestedEx) + { + super(msg, nestedEx); + this.code = code; + } + + public Code getCode() + { + return code; + } + + public enum Code + { + TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/CaptchaExpireException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/CaptchaExpireException.java new file mode 100644 index 0000000..8ea77f9 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/CaptchaExpireException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception.user; + +/** + * 验证码失效异常类 + * + * @author ruoyi + */ +public class CaptchaExpireException extends UserException +{ + private static final long serialVersionUID = 1L; + + public CaptchaExpireException() + { + super("user.jcaptcha.expire", null); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserException.java new file mode 100644 index 0000000..25cef32 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserException.java @@ -0,0 +1,18 @@ +package com.zeroerr.common.core.exception.user; + +import com.zeroerr.common.core.exception.base.BaseException; + +/** + * 用户信息异常类 + * + * @author ruoyi + */ +public class UserException extends BaseException +{ + private static final long serialVersionUID = 1L; + + public UserException(String code, Object[] args) + { + super("user", code, args, null); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserPasswordNotMatchException.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserPasswordNotMatchException.java new file mode 100644 index 0000000..f2413ea --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/exception/user/UserPasswordNotMatchException.java @@ -0,0 +1,16 @@ +package com.zeroerr.common.core.exception.user; + +/** + * 用户密码不正确或不符合规范异常类 + * + * @author ruoyi + */ +public class UserPasswordNotMatchException extends UserException +{ + private static final long serialVersionUID = 1L; + + public UserPasswordNotMatchException() + { + super("user.password.not.match", null); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/CharsetKit.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/CharsetKit.java new file mode 100644 index 0000000..32eb268 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/CharsetKit.java @@ -0,0 +1,86 @@ +package com.zeroerr.common.core.text; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 字符集工具类 + * + * @author ruoyi + */ +public class CharsetKit +{ + /** ISO-8859-1 */ + public static final String ISO_8859_1 = "ISO-8859-1"; + /** UTF-8 */ + public static final String UTF_8 = "UTF-8"; + /** GBK */ + public static final String GBK = "GBK"; + + /** ISO-8859-1 */ + public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1); + /** UTF-8 */ + public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8); + /** GBK */ + public static final Charset CHARSET_GBK = Charset.forName(GBK); + + /** + * 转换为Charset对象 + * + * @param charset 字符集,为空则返回默认字符集 + * @return Charset + */ + public static Charset charset(String charset) + { + return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset); + } + + /** + * 转换字符串的字符集编码 + * + * @param source 字符串 + * @param srcCharset 源字符集,默认ISO-8859-1 + * @param destCharset 目标字符集,默认UTF-8 + * @return 转换后的字符集 + */ + public static String convert(String source, String srcCharset, String destCharset) + { + return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset)); + } + + /** + * 转换字符串的字符集编码 + * + * @param source 字符串 + * @param srcCharset 源字符集,默认ISO-8859-1 + * @param destCharset 目标字符集,默认UTF-8 + * @return 转换后的字符集 + */ + public static String convert(String source, Charset srcCharset, Charset destCharset) + { + if (null == srcCharset) + { + srcCharset = StandardCharsets.ISO_8859_1; + } + + if (null == destCharset) + { + destCharset = StandardCharsets.UTF_8; + } + + if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) + { + return source; + } + return new String(source.getBytes(srcCharset), destCharset); + } + + /** + * @return 系统字符集编码 + */ + public static String systemCharset() + { + return Charset.defaultCharset().name(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/Convert.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/Convert.java new file mode 100644 index 0000000..d3c6298 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/Convert.java @@ -0,0 +1,1016 @@ +package com.zeroerr.common.core.text; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.math.RoundingMode; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.text.NumberFormat; +import java.util.Set; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 类型转换器 + * + * @author ruoyi + */ +public class Convert +{ + /** + * 转换为字符串
+ * 如果给定的值为null,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static String toStr(Object value, String defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof String) + { + return (String) value; + } + return value.toString(); + } + + /** + * 转换为字符串
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static String toStr(Object value) + { + return toStr(value, null); + } + + /** + * 转换为字符
+ * 如果给定的值为null,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Character toChar(Object value, Character defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof Character) + { + return (Character) value; + } + + final String valueStr = toStr(value, null); + return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0); + } + + /** + * 转换为字符
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Character toChar(Object value) + { + return toChar(value, null); + } + + /** + * 转换为byte
+ * 如果给定的值为null,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Byte toByte(Object value, Byte defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Byte) + { + return (Byte) value; + } + if (value instanceof Number) + { + return ((Number) value).byteValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Byte.parseByte(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为byte
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Byte toByte(Object value) + { + return toByte(value, null); + } + + /** + * 转换为Short
+ * 如果给定的值为null,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Short toShort(Object value, Short defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Short) + { + return (Short) value; + } + if (value instanceof Number) + { + return ((Number) value).shortValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Short.parseShort(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Short
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Short toShort(Object value) + { + return toShort(value, null); + } + + /** + * 转换为Number
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Number toNumber(Object value, Number defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Number) + { + return (Number) value; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return NumberFormat.getInstance().parse(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Number
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Number toNumber(Object value) + { + return toNumber(value, null); + } + + /** + * 转换为int
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Integer toInt(Object value, Integer defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Integer) + { + return (Integer) value; + } + if (value instanceof Number) + { + return ((Number) value).intValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Integer.parseInt(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为int
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Integer toInt(Object value) + { + return toInt(value, null); + } + + /** + * 转换为Integer数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String str) + { + return toIntArray(",", str); + } + + /** + * 转换为Long数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String str) + { + return toLongArray(",", str); + } + + /** + * 转换为Integer数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Integer[] {}; + } + String[] arr = str.split(split); + final Integer[] ints = new Integer[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Integer v = toInt(arr[i], 0); + ints[i] = v; + } + return ints; + } + + /** + * 转换为Long数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Long[] {}; + } + String[] arr = str.split(split); + final Long[] longs = new Long[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Long v = toLong(arr[i], null); + longs[i] = v; + } + return longs; + } + + /** + * 转换为String数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String str) + { + if (StringUtils.isEmpty(str)) + { + return new String[] {}; + } + return toStrArray(",", str); + } + + /** + * 转换为String数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String split, String str) + { + return str.split(split); + } + + /** + * 转换为long
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Long toLong(Object value, Long defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Long) + { + return (Long) value; + } + if (value instanceof Number) + { + return ((Number) value).longValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).longValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为long
+ * 如果给定的值为null,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Long toLong(Object value) + { + return toLong(value, null); + } + + /** + * 转换为double
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Double toDouble(Object value, Double defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Double) + { + return (Double) value; + } + if (value instanceof Number) + { + return ((Number) value).doubleValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).doubleValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为double
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Double toDouble(Object value) + { + return toDouble(value, null); + } + + /** + * 转换为Float
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Float toFloat(Object value, Float defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Float) + { + return (Float) value; + } + if (value instanceof Number) + { + return ((Number) value).floatValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Float.parseFloat(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Float
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Float toFloat(Object value) + { + return toFloat(value, null); + } + + /** + * 转换为boolean
+ * String支持的值为:true、false、yes、ok、no,1,0 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Boolean toBool(Object value, Boolean defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Boolean) + { + return (Boolean) value; + } + String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + valueStr = valueStr.trim().toLowerCase(); + switch (valueStr) + { + case "true": + case "yes": + case "ok": + case "1": + return true; + case "false": + case "no": + case "0": + return false; + default: + return defaultValue; + } + } + + /** + * 转换为boolean
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Boolean toBool(Object value) + { + return toBool(value, null); + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * + * @param clazz Enum的Class + * @param value 值 + * @param defaultValue 默认值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value, E defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (clazz.isAssignableFrom(value.getClass())) + { + @SuppressWarnings("unchecked") + E myE = (E) value; + return myE; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Enum.valueOf(clazz, valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * + * @param clazz Enum的Class + * @param value 值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value) + { + return toEnum(clazz, value, null); + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value, BigInteger defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigInteger) + { + return (BigInteger) value; + } + if (value instanceof Long) + { + return BigInteger.valueOf((Long) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigInteger(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空,或者转换失败,返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value) + { + return toBigInteger(value, null); + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigDecimal) + { + return (BigDecimal) value; + } + if (value instanceof Long) + { + return new BigDecimal((Long) value); + } + if (value instanceof Double) + { + return BigDecimal.valueOf((Double) value); + } + if (value instanceof Integer) + { + return new BigDecimal((Integer) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigDecimal(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空,或者转换失败,返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value) + { + return toBigDecimal(value, null); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @return 字符串 + */ + public static String utf8Str(Object obj) + { + return str(obj, CharsetKit.CHARSET_UTF_8); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charsetName 字符集 + * @return 字符串 + */ + public static String str(Object obj, String charsetName) + { + return str(obj, Charset.forName(charsetName)); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(Object obj, Charset charset) + { + if (null == obj) + { + return null; + } + + if (obj instanceof String) + { + return (String) obj; + } + else if (obj instanceof byte[] || obj instanceof Byte[]) + { + if (obj instanceof byte[]) + { + return str((byte[]) obj, charset); + } + else + { + Byte[] bytes = (Byte[]) obj; + int length = bytes.length; + byte[] dest = new byte[length]; + for (int i = 0; i < length; i++) + { + dest[i] = bytes[i]; + } + return str(dest, charset); + } + } + else if (obj instanceof ByteBuffer) + { + return str((ByteBuffer) obj, charset); + } + return obj.toString(); + } + + /** + * 将byte数组转为字符串 + * + * @param bytes byte数组 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(byte[] bytes, String charset) + { + return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); + } + + /** + * 解码字节码 + * + * @param data 字符串 + * @param charset 字符集,如果此字段为空,则解码的结果取决于平台 + * @return 解码后的字符串 + */ + public static String str(byte[] data, Charset charset) + { + if (data == null) + { + return null; + } + + if (null == charset) + { + return new String(data); + } + return new String(data, charset); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集,如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, String charset) + { + if (data == null) + { + return null; + } + + return str(data, Charset.forName(charset)); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集,如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, Charset charset) + { + if (null == charset) + { + charset = Charset.defaultCharset(); + } + return charset.decode(data).toString(); + } + + // ----------------------------------------------------------------------- 全角半角转换 + /** + * 半角转全角 + * + * @param input String. + * @return 全角字符串. + */ + public static String toSBC(String input) + { + return toSBC(input, null); + } + + /** + * 半角转全角 + * + * @param input String + * @param notConvertSet 不替换的字符集合 + * @return 全角字符串. + */ + public static String toSBC(String input, Set notConvertSet) + { + char[] c = input.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == ' ') + { + c[i] = '\u3000'; + } + else if (c[i] < '\177') + { + c[i] = (char) (c[i] + 65248); + + } + } + return new String(c); + } + + /** + * 全角转半角 + * + * @param input String. + * @return 半角字符串 + */ + public static String toDBC(String input) + { + return toDBC(input, null); + } + + /** + * 替换全角为半角 + * + * @param text 文本 + * @param notConvertSet 不替换的字符集合 + * @return 替换后的字符 + */ + public static String toDBC(String text, Set notConvertSet) + { + char[] c = text.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == '\u3000') + { + c[i] = ' '; + } + else if (c[i] > '\uFF00' && c[i] < '\uFF5F') + { + c[i] = (char) (c[i] - 65248); + } + } + return new String(c); + } + + /** + * 数字金额大写转换 先写个完整的然后将如零拾替换成零 + * + * @param n 数字 + * @return 中文大写数字 + */ + public static String digitUppercase(double n) + { + String[] fraction = { "角", "分" }; + String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; + String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } }; + + String head = n < 0 ? "负" : ""; + n = Math.abs(n); + + String s = ""; + for (int i = 0; i < fraction.length; i++) + { + // 优化double计算精度丢失问题 + BigDecimal nNum = new BigDecimal(n); + BigDecimal decimal = new BigDecimal(10); + BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN); + double d = scale.doubleValue(); + s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); + } + if (s.length() < 1) + { + s = "整"; + } + int integerPart = (int) Math.floor(n); + + for (int i = 0; i < unit[0].length && integerPart > 0; i++) + { + String p = ""; + for (int j = 0; j < unit[1].length && n > 0; j++) + { + p = digit[integerPart % 10] + unit[1][j] + p; + integerPart = integerPart / 10; + } + s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; + } + return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/StrFormatter.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/StrFormatter.java new file mode 100644 index 0000000..6ba84d3 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/text/StrFormatter.java @@ -0,0 +1,92 @@ +package com.zeroerr.common.core.text; + +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 字符串格式化 + * + * @author ruoyi + */ +public class StrFormatter +{ + public static final String EMPTY_JSON = "{}"; + public static final char C_BACKSLASH = '\\'; + public static final char C_DELIM_START = '{'; + public static final char C_DELIM_END = '}'; + + /** + * 格式化字符串
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例:
+ * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param strPattern 字符串模板 + * @param argArray 参数列表 + * @return 结果 + */ + public static String format(final String strPattern, final Object... argArray) + { + if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) + { + return strPattern; + } + final int strPatternLength = strPattern.length(); + + // 初始化定义好的长度以获得更好的性能 + StringBuilder sbuf = new StringBuilder(strPatternLength + 50); + + int handledPosition = 0; + int delimIndex;// 占位符所在位置 + for (int argIndex = 0; argIndex < argArray.length; argIndex++) + { + delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); + if (delimIndex == -1) + { + if (handledPosition == 0) + { + return strPattern; + } + else + { // 字符串模板剩余部分不再包含占位符,加入剩余部分后返回结果 + sbuf.append(strPattern, handledPosition, strPatternLength); + return sbuf.toString(); + } + } + else + { + if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) + { + if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) + { + // 转义符之前还有一个转义符,占位符依旧有效 + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(Convert.utf8Str(argArray[argIndex])); + handledPosition = delimIndex + 2; + } + else + { + // 占位符被转义 + argIndex--; + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(C_DELIM_START); + handledPosition = delimIndex + 1; + } + } + else + { + // 正常占位符 + sbuf.append(strPattern, handledPosition, delimIndex); + sbuf.append(Convert.utf8Str(argArray[argIndex])); + handledPosition = delimIndex + 2; + } + } + } + // 加入最后一个占位符后所有的字符 + sbuf.append(strPattern, handledPosition, strPattern.length()); + + return sbuf.toString(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/DateUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/DateUtils.java new file mode 100644 index 0000000..3ec5af5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/DateUtils.java @@ -0,0 +1,183 @@ +package com.zeroerr.common.core.utils; + +import java.lang.management.ManagementFactory; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Date; +import org.apache.commons.lang3.time.DateFormatUtils; + +/** + * 时间工具类 + * + * @author ruoyi + */ +public class DateUtils extends org.apache.commons.lang3.time.DateUtils +{ + public static String YYYY = "yyyy"; + + public static String YYYY_MM = "yyyy-MM"; + + public static String YYYY_MM_DD = "yyyy-MM-dd"; + + public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + + public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + + private static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + + /** + * 获取当前Date型日期 + * + * @return Date() 当前日期 + */ + public static Date getNowDate() + { + return new Date(); + } + + /** + * 获取当前日期, 默认格式为yyyy-MM-dd + * + * @return String + */ + public static String getDate() + { + return dateTimeNow(YYYY_MM_DD); + } + + public static final String getTime() + { + return dateTimeNow(YYYY_MM_DD_HH_MM_SS); + } + + public static final String dateTimeNow() + { + return dateTimeNow(YYYYMMDDHHMMSS); + } + + public static final String dateTimeNow(final String format) + { + return parseDateToStr(format, new Date()); + } + + public static final String dateTime(final Date date) + { + return parseDateToStr(YYYY_MM_DD, date); + } + + public static final String parseDateToStr(final String format, final Date date) + { + return new SimpleDateFormat(format).format(date); + } + + public static final Date dateTime(final String format, final String ts) + { + try + { + return new SimpleDateFormat(format).parse(ts); + } + catch (ParseException e) + { + throw new RuntimeException(e); + } + } + + /** + * 日期路径 即年/月/日 如2018/08/08 + */ + public static final String datePath() + { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyy/MM/dd"); + } + + /** + * 日期路径 即年/月/日 如20180808 + */ + public static final String dateTime() + { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyyMMdd"); + } + + /** + * 日期型字符串转化为日期 格式 + */ + public static Date parseDate(Object str) + { + if (str == null) + { + return null; + } + try + { + return parseDate(str.toString(), parsePatterns); + } + catch (ParseException e) + { + return null; + } + } + + /** + * 获取服务器启动时间 + */ + public static Date getServerStartDate() + { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + /** + * 计算时间差 + * + * @param endDate 最后时间 + * @param startTime 开始时间 + * @return 时间差(天/小时/分钟) + */ + public static String timeDistance(Date endDate, Date startTime) + { + long nd = 1000 * 24 * 60 * 60; + long nh = 1000 * 60 * 60; + long nm = 1000 * 60; + // long ns = 1000; + // 获得两个时间的毫秒时间差异 + long diff = endDate.getTime() - startTime.getTime(); + // 计算差多少天 + long day = diff / nd; + // 计算差多少小时 + long hour = diff % nd / nh; + // 计算差多少分钟 + long min = diff % nd % nh / nm; + // 计算差多少秒//输出结果 + // long sec = diff % nd % nh % nm / ns; + return day + "天" + hour + "小时" + min + "分钟"; + } + + /** + * 增加 LocalDateTime ==> Date + */ + public static Date toDate(LocalDateTime temporalAccessor) + { + ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + /** + * 增加 LocalDate ==> Date + */ + public static Date toDate(LocalDate temporalAccessor) + { + LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); + ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ExceptionUtil.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ExceptionUtil.java new file mode 100644 index 0000000..33ebd14 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ExceptionUtil.java @@ -0,0 +1,39 @@ +package com.zeroerr.common.core.utils; + +import java.io.PrintWriter; +import java.io.StringWriter; +import org.apache.commons.lang3.exception.ExceptionUtils; + +/** + * 错误信息处理类。 + * + * @author ruoyi + */ +public class ExceptionUtil +{ + /** + * 获取exception的详细错误信息。 + */ + public static String getExceptionMessage(Throwable e) + { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw, true)); + return sw.toString(); + } + + public static String getRootErrorMessage(Exception e) + { + Throwable root = ExceptionUtils.getRootCause(e); + root = (root == null ? e : root); + if (root == null) + { + return ""; + } + String msg = root.getMessage(); + if (msg == null) + { + return "null"; + } + return StringUtils.defaultString(msg); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/JwtUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/JwtUtils.java new file mode 100644 index 0000000..eb602fd --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/JwtUtils.java @@ -0,0 +1,123 @@ +package com.zeroerr.common.core.utils; + +import java.util.Map; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.TokenConstants; +import com.zeroerr.common.core.text.Convert; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +/** + * Jwt工具类 + * + * @author ruoyi + */ +public class JwtUtils +{ + public static String secret = TokenConstants.SECRET; + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + public static String createToken(Map claims) + { + String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact(); + return token; + } + + /** + * 从令牌中获取数据声明 + * + * @param token 令牌 + * @return 数据声明 + */ + public static Claims parseToken(String token) + { + return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); + } + + /** + * 根据令牌获取用户标识 + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserKey(String token) + { + Claims claims = parseToken(token); + return getValue(claims, SecurityConstants.USER_KEY); + } + + /** + * 根据令牌获取用户标识 + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserKey(Claims claims) + { + return getValue(claims, SecurityConstants.USER_KEY); + } + + /** + * 根据令牌获取用户ID + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserId(String token) + { + Claims claims = parseToken(token); + return getValue(claims, SecurityConstants.DETAILS_USER_ID); + } + + /** + * 根据身份信息获取用户ID + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserId(Claims claims) + { + return getValue(claims, SecurityConstants.DETAILS_USER_ID); + } + + /** + * 根据令牌获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public static String getUserName(String token) + { + Claims claims = parseToken(token); + return getValue(claims, SecurityConstants.DETAILS_USERNAME); + } + + /** + * 根据身份信息获取用户名 + * + * @param claims 身份信息 + * @return 用户名 + */ + public static String getUserName(Claims claims) + { + return getValue(claims, SecurityConstants.DETAILS_USERNAME); + } + + /** + * 根据身份信息获取键值 + * + * @param claims 身份信息 + * @param key 键 + * @return 值 + */ + public static String getValue(Claims claims, String key) + { + return Convert.toStr(claims.get(key), ""); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/PageUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/PageUtils.java new file mode 100644 index 0000000..80bd492 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/PageUtils.java @@ -0,0 +1,35 @@ +package com.zeroerr.common.core.utils; + +import com.github.pagehelper.PageHelper; +import com.zeroerr.common.core.utils.sql.SqlUtil; +import com.zeroerr.common.core.web.page.PageDomain; +import com.zeroerr.common.core.web.page.TableSupport; + +/** + * 分页工具类 + * + * @author ruoyi + */ +public class PageUtils extends PageHelper +{ + /** + * 设置请求分页数据 + */ + public static void startPage() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + Boolean reasonable = pageDomain.getReasonable(); + PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); + } + + /** + * 清理分页的线程变量 + */ + public static void clearPage() + { + PageHelper.clearPage(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ServletUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ServletUtils.java new file mode 100644 index 0000000..10401ae --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ServletUtils.java @@ -0,0 +1,333 @@ +package com.zeroerr.common.core.utils; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.util.LinkedCaseInsensitiveMap; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import com.alibaba.fastjson2.JSON; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.text.Convert; +import reactor.core.publisher.Mono; + +/** + * 客户端工具类 + * + * @author ruoyi + */ +public class ServletUtils +{ + /** + * 获取String参数 + */ + public static String getParameter(String name) + { + return getRequest().getParameter(name); + } + + /** + * 获取String参数 + */ + public static String getParameter(String name, String defaultValue) + { + return Convert.toStr(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取Integer参数 + */ + public static Integer getParameterToInt(String name) + { + return Convert.toInt(getRequest().getParameter(name)); + } + + /** + * 获取Integer参数 + */ + public static Integer getParameterToInt(String name, Integer defaultValue) + { + return Convert.toInt(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取Boolean参数 + */ + public static Boolean getParameterToBool(String name) + { + return Convert.toBool(getRequest().getParameter(name)); + } + + /** + * 获取Boolean参数 + */ + public static Boolean getParameterToBool(String name, Boolean defaultValue) + { + return Convert.toBool(getRequest().getParameter(name), defaultValue); + } + + /** + * 获得所有请求参数 + * + * @param request 请求对象{@link ServletRequest} + * @return Map + */ + public static Map getParams(ServletRequest request) + { + final Map map = request.getParameterMap(); + return Collections.unmodifiableMap(map); + } + + /** + * 获得所有请求参数 + * + * @param request 请求对象{@link ServletRequest} + * @return Map + */ + public static Map getParamMap(ServletRequest request) + { + Map params = new HashMap<>(); + for (Map.Entry entry : getParams(request).entrySet()) + { + params.put(entry.getKey(), StringUtils.join(entry.getValue(), ",")); + } + return params; + } + + /** + * 获取request + */ + public static HttpServletRequest getRequest() + { + try + { + return getRequestAttributes().getRequest(); + } + catch (Exception e) + { + return null; + } + } + + /** + * 获取response + */ + public static HttpServletResponse getResponse() + { + try + { + return getRequestAttributes().getResponse(); + } + catch (Exception e) + { + return null; + } + } + + /** + * 获取session + */ + public static HttpSession getSession() + { + return getRequest().getSession(); + } + + public static ServletRequestAttributes getRequestAttributes() + { + try + { + RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); + return (ServletRequestAttributes) attributes; + } + catch (Exception e) + { + return null; + } + } + + public static String getHeader(HttpServletRequest request, String name) + { + String value = request.getHeader(name); + if (StringUtils.isEmpty(value)) + { + return StringUtils.EMPTY; + } + return urlDecode(value); + } + + public static Map getHeaders(HttpServletRequest request) + { + Map map = new LinkedCaseInsensitiveMap<>(); + Enumeration enumeration = request.getHeaderNames(); + if (enumeration != null) + { + while (enumeration.hasMoreElements()) + { + String key = enumeration.nextElement(); + String value = request.getHeader(key); + map.put(key, value); + } + } + return map; + } + + /** + * 将字符串渲染到客户端 + * + * @param response 渲染对象 + * @param string 待渲染的字符串 + */ + public static void renderString(HttpServletResponse response, String string) + { + try + { + response.setStatus(200); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().print(string); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + /** + * 是否是Ajax异步请求 + * + * @param request + */ + public static boolean isAjaxRequest(HttpServletRequest request) + { + String accept = request.getHeader("accept"); + if (accept != null && accept.contains("application/json")) + { + return true; + } + + String xRequestedWith = request.getHeader("X-Requested-With"); + if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) + { + return true; + } + + String uri = request.getRequestURI(); + if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) + { + return true; + } + + String ajax = request.getParameter("__ajax"); + return StringUtils.inStringIgnoreCase(ajax, "json", "xml"); + } + + /** + * 内容编码 + * + * @param str 内容 + * @return 编码后的内容 + */ + public static String urlEncode(String str) + { + try + { + return URLEncoder.encode(str, Constants.UTF8); + } + catch (UnsupportedEncodingException e) + { + return StringUtils.EMPTY; + } + } + + /** + * 内容解码 + * + * @param str 内容 + * @return 解码后的内容 + */ + public static String urlDecode(String str) + { + try + { + return URLDecoder.decode(str, Constants.UTF8); + } + catch (UnsupportedEncodingException e) + { + return StringUtils.EMPTY; + } + } + + /** + * 设置webflux模型响应 + * + * @param response ServerHttpResponse + * @param value 响应内容 + * @return Mono + */ + public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value) + { + return webFluxResponseWriter(response, HttpStatus.OK, value, R.FAIL); + } + + /** + * 设置webflux模型响应 + * + * @param response ServerHttpResponse + * @param code 响应状态码 + * @param value 响应内容 + * @return Mono + */ + public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value, int code) + { + return webFluxResponseWriter(response, HttpStatus.OK, value, code); + } + + /** + * 设置webflux模型响应 + * + * @param response ServerHttpResponse + * @param status http状态码 + * @param code 响应状态码 + * @param value 响应内容 + * @return Mono + */ + public static Mono webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code) + { + return webFluxResponseWriter(response, MediaType.APPLICATION_JSON_VALUE, status, value, code); + } + + /** + * 设置webflux模型响应 + * + * @param response ServerHttpResponse + * @param contentType content-type + * @param status http状态码 + * @param code 响应状态码 + * @param value 响应内容 + * @return Mono + */ + public static Mono webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code) + { + response.setStatusCode(status); + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, contentType); + R result = R.fail(code, value.toString()); + DataBuffer dataBuffer = response.bufferFactory().wrap(JSON.toJSONString(result).getBytes()); + return response.writeWith(Mono.just(dataBuffer)); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/SpringUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/SpringUtils.java new file mode 100644 index 0000000..cba2843 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/SpringUtils.java @@ -0,0 +1,114 @@ +package com.zeroerr.common.core.utils; + +import org.springframework.aop.framework.AopContext; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.stereotype.Component; + +/** + * spring工具类 方便在非spring管理环境中获取bean + * + * @author ruoyi + */ +@Component +public final class SpringUtils implements BeanFactoryPostProcessor +{ + /** Spring应用上下文环境 */ + private static ConfigurableListableBeanFactory beanFactory; + + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException + { + SpringUtils.beanFactory = beanFactory; + } + + /** + * 获取对象 + * + * @param name + * @return Object 一个以所给名字注册的bean的实例 + * @throws org.springframework.beans.BeansException + * + */ + @SuppressWarnings("unchecked") + public static T getBean(String name) throws BeansException + { + return (T) beanFactory.getBean(name); + } + + /** + * 获取类型为requiredType的对象 + * + * @param clz + * @return + * @throws org.springframework.beans.BeansException + * + */ + public static T getBean(Class clz) throws BeansException + { + T result = (T) beanFactory.getBean(clz); + return result; + } + + /** + * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true + * + * @param name + * @return boolean + */ + public static boolean containsBean(String name) + { + return beanFactory.containsBean(name); + } + + /** + * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException) + * + * @param name + * @return boolean + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.isSingleton(name); + } + + /** + * @param name + * @return Class 注册对象的类型 + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static Class getType(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.getType(name); + } + + /** + * 如果给定的bean名字在bean定义中有别名,则返回这些别名 + * + * @param name + * @return + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static String[] getAliases(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.getAliases(name); + } + + /** + * 获取aop代理对象 + * + * @param invoker + * @return + */ + @SuppressWarnings("unchecked") + public static T getAopProxy(T invoker) + { + return (T) AopContext.currentProxy(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/StringUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/StringUtils.java new file mode 100644 index 0000000..5ad126f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/StringUtils.java @@ -0,0 +1,607 @@ +package com.zeroerr.common.core.utils; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import org.springframework.util.AntPathMatcher; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.text.StrFormatter; + +/** + * 字符串工具类 + * + * @author ruoyi + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils +{ + /** 空字符串 */ + private static final String NULLSTR = ""; + + /** 下划线 */ + private static final char SEPARATOR = '_'; + + /** 星号 */ + private static final char ASTERISK = '*'; + + /** + * 获取参数不为空值 + * + * @param value defaultValue 要判断的value + * @return value 返回值 + */ + public static T nvl(T value, T defaultValue) + { + return value != null ? value : defaultValue; + } + + /** + * * 判断一个Collection是否为空, 包含List,Set,Queue + * + * @param coll 要判断的Collection + * @return true:为空 false:非空 + */ + public static boolean isEmpty(Collection coll) + { + return isNull(coll) || coll.isEmpty(); + } + + /** + * * 判断一个Collection是否非空,包含List,Set,Queue + * + * @param coll 要判断的Collection + * @return true:非空 false:空 + */ + public static boolean isNotEmpty(Collection coll) + { + return !isEmpty(coll); + } + + /** + * * 判断一个对象数组是否为空 + * + * @param objects 要判断的对象数组 + ** @return true:为空 false:非空 + */ + public static boolean isEmpty(Object[] objects) + { + return isNull(objects) || (objects.length == 0); + } + + /** + * * 判断一个对象数组是否非空 + * + * @param objects 要判断的对象数组 + * @return true:非空 false:空 + */ + public static boolean isNotEmpty(Object[] objects) + { + return !isEmpty(objects); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true:为空 false:非空 + */ + public static boolean isEmpty(Map map) + { + return isNull(map) || map.isEmpty(); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true:非空 false:空 + */ + public static boolean isNotEmpty(Map map) + { + return !isEmpty(map); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true:为空 false:非空 + */ + public static boolean isEmpty(String str) + { + return isNull(str) || NULLSTR.equals(str.trim()); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true:非空串 false:空串 + */ + public static boolean isNotEmpty(String str) + { + return !isEmpty(str); + } + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true:为空 false:非空 + */ + public static boolean isNull(Object object) + { + return object == null; + } + + /** + * * 判断一个对象是否非空 + * + * @param object Object + * @return true:非空 false:空 + */ + public static boolean isNotNull(Object object) + { + return !isNull(object); + } + + /** + * * 判断一个对象是否是数组类型(Java基本型别的数组) + * + * @param object 对象 + * @return true:是数组 false:不是数组 + */ + public static boolean isArray(Object object) + { + return isNotNull(object) && object.getClass().isArray(); + } + + /** + * 去空格 + */ + public static String trim(String str) + { + return (str == null ? "" : str.trim()); + } + + /** + * 替换指定字符串的指定区间内字符为"*" + * + * @param str 字符串 + * @param startInclude 开始位置(包含) + * @param endExclude 结束位置(不包含) + * @return 替换后的字符串 + */ + public static String hide(CharSequence str, int startInclude, int endExclude) + { + if (isEmpty(str)) + { + return NULLSTR; + } + final int strLength = str.length(); + if (startInclude > strLength) + { + return NULLSTR; + } + if (endExclude > strLength) + { + endExclude = strLength; + } + if (startInclude > endExclude) + { + // 如果起始位置大于结束位置,不替换 + return NULLSTR; + } + final char[] chars = new char[strLength]; + for (int i = 0; i < strLength; i++) + { + if (i >= startInclude && i < endExclude) + { + chars[i] = ASTERISK; + } + else + { + chars[i] = str.charAt(i); + } + } + return new String(chars); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) + { + if (str == null) + { + return NULLSTR; + } + + if (start < 0) + { + start = str.length() + start; + } + + if (start < 0) + { + start = 0; + } + if (start > str.length()) + { + return NULLSTR; + } + + return str.substring(start); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) + { + if (str == null) + { + return NULLSTR; + } + + if (end < 0) + { + end = str.length() + end; + } + if (start < 0) + { + start = str.length() + start; + } + + if (end > str.length()) + { + end = str.length(); + } + + if (start > end) + { + return NULLSTR; + } + + if (start < 0) + { + start = 0; + } + if (end < 0) + { + end = 0; + } + + return str.substring(start, end); + } + + /** + * 判断是否为空,并且不是空白字符 + * + * @param str 要判断的value + * @return 结果 + */ + public static boolean hasText(String str) + { + return (str != null && !str.isEmpty() && containsText(str)); + } + + private static boolean containsText(CharSequence str) + { + int strLen = str.length(); + for (int i = 0; i < strLen; i++) + { + if (!Character.isWhitespace(str.charAt(i))) + { + return true; + } + } + return false; + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例:
+ * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}: format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板,被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) + { + if (isEmpty(params) || isEmpty(template)) + { + return template; + } + return StrFormatter.format(template, params); + } + + /** + * 是否为http(s)://开头 + * + * @param link 链接 + * @return 结果 + */ + public static boolean ishttp(String link) + { + return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS); + } + + /** + * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value + * + * @param collection 给定的集合 + * @param array 给定的数组 + * @return boolean 结果 + */ + public static boolean containsAny(Collection collection, String... array) + { + if (isEmpty(collection) || isEmpty(array)) + { + return false; + } + else + { + for (String str : array) + { + if (collection.contains(str)) + { + return true; + } + } + return false; + } + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) + { + if (str == null) + { + return null; + } + StringBuilder sb = new StringBuilder(); + // 前置字符是否大写 + boolean preCharIsUpperCase = true; + // 当前字符是否大写 + boolean curreCharIsUpperCase = true; + // 下一字符是否大写 + boolean nexteCharIsUpperCase = true; + for (int i = 0; i < str.length(); i++) + { + char c = str.charAt(i); + if (i > 0) + { + preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); + } + else + { + preCharIsUpperCase = false; + } + + curreCharIsUpperCase = Character.isUpperCase(c); + + if (i < (str.length() - 1)) + { + nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1)); + } + + if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) + { + sb.append(SEPARATOR); + } + else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) + { + sb.append(SEPARATOR); + } + sb.append(Character.toLowerCase(c)); + } + + return sb.toString(); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) + { + if (str != null && strs != null) + { + for (String s : strs) + { + if (str.equalsIgnoreCase(trim(s))) + { + return true; + } + } + } + return false; + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空,则返回空字符串。 例如:HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) + { + StringBuilder result = new StringBuilder(); + // 快速检查 + if (name == null || name.isEmpty()) + { + // 没必要转换 + return ""; + } + else if (!name.contains("_")) + { + // 不含下划线,仅将首字母大写 + return name.substring(0, 1).toUpperCase() + name.substring(1); + } + // 用下划线将原始字符串分割 + String[] camels = name.split("_"); + for (String camel : camels) + { + // 跳过原始字符串中开头、结尾的下换线或双重下划线 + if (camel.isEmpty()) + { + continue; + } + // 首字母大写 + result.append(camel.substring(0, 1).toUpperCase()); + result.append(camel.substring(1).toLowerCase()); + } + return result.toString(); + } + + /** + * 驼峰式命名法 + * 例如:user_name->userName + */ + public static String toCamelCase(String s) + { + if (s == null) + { + return null; + } + if (s.indexOf(SEPARATOR) == -1) + { + return s; + } + s = s.toLowerCase(); + StringBuilder sb = new StringBuilder(s.length()); + boolean upperCase = false; + for (int i = 0; i < s.length(); i++) + { + char c = s.charAt(i); + + if (c == SEPARATOR) + { + upperCase = true; + } + else if (upperCase) + { + sb.append(Character.toUpperCase(c)); + upperCase = false; + } + else + { + sb.append(c); + } + } + return sb.toString(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) + { + if (isEmpty(str) || isEmpty(strs)) + { + return false; + } + for (String pattern : strs) + { + if (isMatch(pattern, str)) + { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串,不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) + { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + @SuppressWarnings("unchecked") + public static T cast(Object obj) + { + return (T) obj; + } + + /** + * 数字左边补齐0,使之达到指定长度。注意,如果数字转换为字符串后,长度大于size,则只保留 最后size个字符。 + * + * @param num 数字对象 + * @param size 字符串指定长度 + * @return 返回数字的字符串格式,该字符串为指定长度。 + */ + public static final String padl(final Number num, final int size) + { + return padl(num.toString(), size, '0'); + } + + /** + * 字符串左补齐。如果原始字符串s长度大于size,则只保留最后size个字符。 + * + * @param s 原始字符串 + * @param size 字符串指定长度 + * @param c 用于补齐的字符 + * @return 返回指定长度的字符串,由原字符串左补齐或截取得到。 + */ + public static final String padl(final String s, final int size, final char c) + { + final StringBuilder sb = new StringBuilder(size); + if (s != null) + { + final int len = s.length(); + if (s.length() <= size) + { + for (int i = size - len; i > 0; i--) + { + sb.append(c); + } + sb.append(s); + } + else + { + return s.substring(len - size, len); + } + } + else + { + for (int i = size; i > 0; i--) + { + sb.append(c); + } + } + return sb.toString(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanUtils.java new file mode 100644 index 0000000..f516ddc --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanUtils.java @@ -0,0 +1,110 @@ +package com.zeroerr.common.core.utils.bean; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Bean 工具类 + * + * @author ruoyi + */ +public class BeanUtils extends org.springframework.beans.BeanUtils +{ + /** Bean方法名中属性名开始的下标 */ + private static final int BEAN_METHOD_PROP_INDEX = 3; + + /** * 匹配getter方法的正则表达式 */ + private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); + + /** * 匹配setter方法的正则表达式 */ + private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); + + /** + * Bean属性复制工具方法。 + * + * @param dest 目标对象 + * @param src 源对象 + */ + public static void copyBeanProp(Object dest, Object src) + { + try + { + copyProperties(src, dest); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + /** + * 获取对象的setter方法。 + * + * @param obj 对象 + * @return 对象的setter方法列表 + */ + public static List getSetterMethods(Object obj) + { + // setter方法列表 + List setterMethods = new ArrayList(); + + // 获取所有方法 + Method[] methods = obj.getClass().getMethods(); + + // 查找setter方法 + + for (Method method : methods) + { + Matcher m = SET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 1)) + { + setterMethods.add(method); + } + } + // 返回setter方法列表 + return setterMethods; + } + + /** + * 获取对象的getter方法。 + * + * @param obj 对象 + * @return 对象的getter方法列表 + */ + + public static List getGetterMethods(Object obj) + { + // getter方法列表 + List getterMethods = new ArrayList(); + // 获取所有方法 + Method[] methods = obj.getClass().getMethods(); + // 查找getter方法 + for (Method method : methods) + { + Matcher m = GET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 0)) + { + getterMethods.add(method); + } + } + // 返回getter方法列表 + return getterMethods; + } + + /** + * 检查Bean方法名中的属性名是否相等。
+ * 如getName()和setName()属性名一样,getName()和setAge()属性名不一样。 + * + * @param m1 方法名1 + * @param m2 方法名2 + * @return 属性名一样返回true,否则返回false + */ + + public static boolean isMethodPropEquals(String m1, String m2) + { + return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanValidators.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanValidators.java new file mode 100644 index 0000000..5b48b90 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/bean/BeanValidators.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.core.utils.bean; + +import java.util.Set; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Validator; + +/** + * bean对象属性验证 + * + * @author ruoyi + */ +public class BeanValidators +{ + public static void validateWithException(Validator validator, Object object, Class... groups) + throws ConstraintViolationException + { + Set> constraintViolations = validator.validate(object, groups); + if (!constraintViolations.isEmpty()) + { + throw new ConstraintViolationException(constraintViolations); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileTypeUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileTypeUtils.java new file mode 100644 index 0000000..f768515 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileTypeUtils.java @@ -0,0 +1,95 @@ +package com.zeroerr.common.core.utils.file; + +import java.io.File; +import java.util.Objects; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件类型工具类 + * + * @author ruoyi + */ +public class FileTypeUtils +{ + /** + * 获取文件类型 + *

+ * 例如: ruoyi.txt, 返回: txt + * + * @param file 文件名 + * @return 后缀(不含".") + */ + public static String getFileType(File file) + { + if (null == file) + { + return StringUtils.EMPTY; + } + return getFileType(file.getName()); + } + + /** + * 获取文件类型 + *

+ * 例如: ruoyi.txt, 返回: txt + * + * @param fileName 文件名 + * @return 后缀(不含".") + */ + public static String getFileType(String fileName) + { + int separatorIndex = fileName.lastIndexOf("."); + if (separatorIndex < 0) + { + return ""; + } + return fileName.substring(separatorIndex + 1).toLowerCase(); + } + + /** + * 获取文件名的后缀 + * + * @param file 表单文件 + * @return 后缀名 + */ + public static final String getExtension(MultipartFile file) + { + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (StringUtils.isEmpty(extension)) + { + extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType())); + } + return extension; + } + + /** + * 获取文件类型 + * + * @param photoByte 文件字节码 + * @return 后缀(不含".") + */ + public static String getFileExtendName(byte[] photoByte) + { + String strFileExtendName = "JPG"; + if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) + && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) + { + strFileExtendName = "GIF"; + } + else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) + { + strFileExtendName = "JPG"; + } + else if ((photoByte[0] == 66) && (photoByte[1] == 77)) + { + strFileExtendName = "BMP"; + } + else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) + { + strFileExtendName = "PNG"; + } + return strFileExtendName; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileUtils.java new file mode 100644 index 0000000..0fa874d --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/FileUtils.java @@ -0,0 +1,253 @@ +package com.zeroerr.common.core.utils.file; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 文件处理工具类 + * + * @author ruoyi + */ +public class FileUtils +{ + /** 字符常量:斜杠 {@code '/'} */ + public static final char SLASH = '/'; + + /** 字符常量:反斜杠 {@code '\\'} */ + public static final char BACKSLASH = '\\'; + + public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; + + /** + * 输出指定文件的byte数组 + * + * @param filePath 文件路径 + * @param os 输出流 + * @return + */ + public static void writeBytes(String filePath, OutputStream os) throws IOException + { + FileInputStream fis = null; + try + { + File file = new File(filePath); + if (!file.exists()) + { + throw new FileNotFoundException(filePath); + } + fis = new FileInputStream(file); + byte[] b = new byte[1024]; + int length; + while ((length = fis.read(b)) > 0) + { + os.write(b, 0, length); + } + } + catch (IOException e) + { + throw e; + } + finally + { + if (os != null) + { + try + { + os.close(); + } + catch (IOException e1) + { + e1.printStackTrace(); + } + } + if (fis != null) + { + try + { + fis.close(); + } + catch (IOException e1) + { + e1.printStackTrace(); + } + } + } + } + + /** + * 删除文件 + * + * @param filePath 文件 + * @return + */ + public static boolean deleteFile(String filePath) + { + boolean flag = false; + File file = new File(filePath); + // 路径为文件且不为空则进行删除 + if (file.isFile() && file.exists()) + { + flag = file.delete(); + } + return flag; + } + + /** + * 文件名称验证 + * + * @param filename 文件名称 + * @return true 正常 false 非法 + */ + public static boolean isValidFilename(String filename) + { + return filename.matches(FILENAME_PATTERN); + } + + /** + * 检查文件是否可下载 + * + * @param resource 需要下载的文件 + * @return true 正常 false 非法 + */ + public static boolean checkAllowDownload(String resource) + { + // 禁止目录上跳级别 + if (StringUtils.contains(resource, "..")) + { + return false; + } + // 判断是否在允许下载的文件规则内 + return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)); + } + + /** + * 下载文件名重新编码 + * + * @param request 请求对象 + * @param fileName 文件名 + * @return 编码后的文件名 + */ + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException + { + final String agent = request.getHeader("USER-AGENT"); + String filename = fileName; + if (agent.contains("MSIE")) + { + // IE浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + filename = filename.replace("+", " "); + } + else if (agent.contains("Firefox")) + { + // 火狐浏览器 + filename = new String(fileName.getBytes(), "ISO8859-1"); + } + else if (agent.contains("Chrome")) + { + // google浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } + else + { + // 其它浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } + return filename; + } + + /** + * 返回文件名 + * + * @param filePath 文件 + * @return 文件名 + */ + public static String getName(String filePath) + { + if (null == filePath) + { + return null; + } + int len = filePath.length(); + if (0 == len) + { + return filePath; + } + if (isFileSeparator(filePath.charAt(len - 1))) + { + // 以分隔符结尾的去掉结尾分隔符 + len--; + } + + int begin = 0; + char c; + for (int i = len - 1; i > -1; i--) + { + c = filePath.charAt(i); + if (isFileSeparator(c)) + { + // 查找最后一个路径分隔符(/或者\) + begin = i + 1; + break; + } + } + + return filePath.substring(begin, len); + } + + /** + * 是否为Windows或者Linux(Unix)文件分隔符
+ * Windows平台下分隔符为\,Linux(Unix)为/ + * + * @param c 字符 + * @return 是否为Windows或者Linux(Unix)文件分隔符 + */ + public static boolean isFileSeparator(char c) + { + return SLASH == c || BACKSLASH == c; + } + + /** + * 下载文件名重新编码 + * + * @param response 响应对象 + * @param realFileName 真实文件名 + * @return + */ + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException + { + String percentEncodedFileName = percentEncode(realFileName); + + StringBuilder contentDispositionValue = new StringBuilder(); + contentDispositionValue.append("attachment; filename=") + .append(percentEncodedFileName) + .append(";") + .append("filename*=") + .append("utf-8''") + .append(percentEncodedFileName); + + response.setHeader("Content-disposition", contentDispositionValue.toString()); + response.setHeader("download-filename", percentEncodedFileName); + } + + /** + * 百分号编码工具方法 + * + * @param s 需要百分号编码的字符串 + * @return 百分号编码后的字符串 + */ + public static String percentEncode(String s) throws UnsupportedEncodingException + { + String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); + return encode.replaceAll("\\+", "%20"); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/ImageUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/ImageUtils.java new file mode 100644 index 0000000..c1c30f0 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/ImageUtils.java @@ -0,0 +1,84 @@ +package com.zeroerr.common.core.utils.file; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.Arrays; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 图片处理工具类 + * + * @author ruoyi + */ +public class ImageUtils +{ + private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); + + public static byte[] getImage(String imagePath) + { + InputStream is = getFile(imagePath); + try + { + return IOUtils.toByteArray(is); + } + catch (Exception e) + { + log.error("图片加载异常 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(is); + } + } + + public static InputStream getFile(String imagePath) + { + try + { + byte[] result = readFile(imagePath); + result = Arrays.copyOf(result, result.length); + return new ByteArrayInputStream(result); + } + catch (Exception e) + { + log.error("获取图片异常 {}", e); + } + return null; + } + + /** + * 读取文件为字节数据 + * + * @param url 地址 + * @return 字节数据 + */ + public static byte[] readFile(String url) + { + InputStream in = null; + try + { + // 网络地址 + URL urlObj = new URL(url); + URLConnection urlConnection = urlObj.openConnection(); + urlConnection.setConnectTimeout(30 * 1000); + urlConnection.setReadTimeout(60 * 1000); + urlConnection.setDoInput(true); + in = urlConnection.getInputStream(); + return IOUtils.toByteArray(in); + } + catch (Exception e) + { + log.error("访问文件异常 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(in); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/MimeTypeUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/MimeTypeUtils.java new file mode 100644 index 0000000..96d4fd9 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/file/MimeTypeUtils.java @@ -0,0 +1,59 @@ +package com.zeroerr.common.core.utils.file; + +/** + * 媒体类型工具类 + * + * @author ruoyi + */ +public class MimeTypeUtils +{ + public static final String IMAGE_PNG = "image/png"; + + public static final String IMAGE_JPG = "image/jpg"; + + public static final String IMAGE_JPEG = "image/jpeg"; + + public static final String IMAGE_BMP = "image/bmp"; + + public static final String IMAGE_GIF = "image/gif"; + + public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" }; + + public static final String[] FLASH_EXTENSION = { "swf", "flv" }; + + public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", + "asf", "rm", "rmvb" }; + + public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" }; + + public static final String[] DEFAULT_ALLOWED_EXTENSION = { + // 图片 + "bmp", "gif", "jpg", "jpeg", "png", + // word excel powerpoint + "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", + // 压缩文件 + "rar", "zip", "gz", "bz2", + // 视频格式 + "mp4", "avi", "rmvb", + // pdf + "pdf" }; + + public static String getExtension(String prefix) + { + switch (prefix) + { + case IMAGE_PNG: + return "png"; + case IMAGE_JPG: + return "jpg"; + case IMAGE_JPEG: + return "jpeg"; + case IMAGE_BMP: + return "bmp"; + case IMAGE_GIF: + return "gif"; + default: + return ""; + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/EscapeUtil.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/EscapeUtil.java new file mode 100644 index 0000000..f2a18fd --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/EscapeUtil.java @@ -0,0 +1,167 @@ +package com.zeroerr.common.core.utils.html; + +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 转义和反转义工具类 + * + * @author ruoyi + */ +public class EscapeUtil +{ + public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)"; + + private static final char[][] TEXT = new char[64][]; + + static + { + for (int i = 0; i < 64; i++) + { + TEXT[i] = new char[] { (char) i }; + } + + // special HTML characters + TEXT['\''] = "'".toCharArray(); // 单引号 + TEXT['"'] = """.toCharArray(); // 双引号 + TEXT['&'] = "&".toCharArray(); // &符 + TEXT['<'] = "<".toCharArray(); // 小于号 + TEXT['>'] = ">".toCharArray(); // 大于号 + } + + /** + * 转义文本中的HTML字符为安全的字符 + * + * @param text 被转义的文本 + * @return 转义后的文本 + */ + public static String escape(String text) + { + return encode(text); + } + + /** + * 还原被转义的HTML特殊字符 + * + * @param content 包含转义符的HTML内容 + * @return 转换后的字符串 + */ + public static String unescape(String content) + { + return decode(content); + } + + /** + * 清除所有HTML标签,但是不删除标签内的内容 + * + * @param content 文本 + * @return 清除标签后的文本 + */ + public static String clean(String content) + { + return new HTMLFilter().filter(content); + } + + /** + * Escape编码 + * + * @param text 被编码的文本 + * @return 编码后的字符 + */ + private static String encode(String text) + { + if (StringUtils.isEmpty(text)) + { + return StringUtils.EMPTY; + } + + final StringBuilder tmp = new StringBuilder(text.length() * 6); + char c; + for (int i = 0; i < text.length(); i++) + { + c = text.charAt(i); + if (c < 256) + { + tmp.append("%"); + if (c < 16) + { + tmp.append("0"); + } + tmp.append(Integer.toString(c, 16)); + } + else + { + tmp.append("%u"); + if (c <= 0xfff) + { + // issue#I49JU8@Gitee + tmp.append("0"); + } + tmp.append(Integer.toString(c, 16)); + } + } + return tmp.toString(); + } + + /** + * Escape解码 + * + * @param content 被转义的内容 + * @return 解码后的字符串 + */ + public static String decode(String content) + { + if (StringUtils.isEmpty(content)) + { + return content; + } + + StringBuilder tmp = new StringBuilder(content.length()); + int lastPos = 0, pos = 0; + char ch; + while (lastPos < content.length()) + { + pos = content.indexOf("%", lastPos); + if (pos == lastPos) + { + if (content.charAt(pos + 1) == 'u') + { + ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16); + tmp.append(ch); + lastPos = pos + 6; + } + else + { + ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16); + tmp.append(ch); + lastPos = pos + 3; + } + } + else + { + if (pos == -1) + { + tmp.append(content.substring(lastPos)); + lastPos = content.length(); + } + else + { + tmp.append(content.substring(lastPos, pos)); + lastPos = pos; + } + } + } + return tmp.toString(); + } + + public static void main(String[] args) + { + String html = ""; + String escape = EscapeUtil.escape(html); + // String html = "ipt>alert(\"XSS\")ipt>"; + // String html = "<123"; + // String html = "123>"; + System.out.println("clean: " + EscapeUtil.clean(html)); + System.out.println("escape: " + escape); + System.out.println("unescape: " + EscapeUtil.unescape(escape)); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/HTMLFilter.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/HTMLFilter.java new file mode 100644 index 0000000..de2768d --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/html/HTMLFilter.java @@ -0,0 +1,570 @@ +package com.zeroerr.common.core.utils.html; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * HTML过滤器,用于去除XSS漏洞隐患。 + * + * @author ruoyi + */ +public final class HTMLFilter +{ + /** + * regex flag union representing /si modifiers in php + **/ + private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; + private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); + private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); + private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); + private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); + private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); + private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); + private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); + private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); + private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); + private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); + private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); + private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); + private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); + private static final Pattern P_END_ARROW = Pattern.compile("^>"); + private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_AMP = Pattern.compile("&"); + private static final Pattern P_QUOTE = Pattern.compile("\""); + private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); + private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); + private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); + + // @xxx could grow large... maybe use sesat's ReferenceMap + private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); + private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); + + /** + * set of allowed html elements, along with allowed attributes for each element + **/ + private final Map> vAllowed; + /** + * counts of open tags for each (allowable) html element + **/ + private final Map vTagCounts = new HashMap<>(); + + /** + * html elements which must always be self-closing (e.g. "") + **/ + private final String[] vSelfClosingTags; + /** + * html elements which must always have separate opening and closing tags (e.g. "") + **/ + private final String[] vNeedClosingTags; + /** + * set of disallowed html elements + **/ + private final String[] vDisallowed; + /** + * attributes which should be checked for valid protocols + **/ + private final String[] vProtocolAtts; + /** + * allowed protocols + **/ + private final String[] vAllowedProtocols; + /** + * tags which should be removed if they contain no content (e.g. "" or "") + **/ + private final String[] vRemoveBlanks; + /** + * entities allowed within html markup + **/ + private final String[] vAllowedEntities; + /** + * flag determining whether comments are allowed in input String. + */ + private final boolean stripComment; + private final boolean encodeQuotes; + /** + * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" + * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. + */ + private final boolean alwaysMakeTags; + + /** + * Default constructor. + */ + public HTMLFilter() + { + vAllowed = new HashMap<>(); + + final ArrayList a_atts = new ArrayList<>(); + a_atts.add("href"); + a_atts.add("target"); + vAllowed.put("a", a_atts); + + final ArrayList img_atts = new ArrayList<>(); + img_atts.add("src"); + img_atts.add("width"); + img_atts.add("height"); + img_atts.add("alt"); + vAllowed.put("img", img_atts); + + final ArrayList no_atts = new ArrayList<>(); + vAllowed.put("b", no_atts); + vAllowed.put("strong", no_atts); + vAllowed.put("i", no_atts); + vAllowed.put("em", no_atts); + + vSelfClosingTags = new String[] { "img" }; + vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; + vDisallowed = new String[] {}; + vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. + vProtocolAtts = new String[] { "src", "href" }; + vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; + vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; + stripComment = true; + encodeQuotes = true; + alwaysMakeTags = false; + } + + /** + * Map-parameter configurable constructor. + * + * @param conf map containing configuration. keys match field names. + */ + @SuppressWarnings("unchecked") + public HTMLFilter(final Map conf) + { + + assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; + assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; + assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; + assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; + assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; + assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; + assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; + assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; + + vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); + vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); + vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); + vDisallowed = (String[]) conf.get("vDisallowed"); + vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); + vProtocolAtts = (String[]) conf.get("vProtocolAtts"); + vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); + vAllowedEntities = (String[]) conf.get("vAllowedEntities"); + stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; + encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; + alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; + } + + private void reset() + { + vTagCounts.clear(); + } + + // --------------------------------------------------------------- + // my versions of some PHP library functions + public static String chr(final int decimal) + { + return String.valueOf((char) decimal); + } + + public static String htmlSpecialChars(final String s) + { + String result = s; + result = regexReplace(P_AMP, "&", result); + result = regexReplace(P_QUOTE, """, result); + result = regexReplace(P_LEFT_ARROW, "<", result); + result = regexReplace(P_RIGHT_ARROW, ">", result); + return result; + } + + // --------------------------------------------------------------- + + /** + * given a user submitted input String, filter out any invalid or restricted html. + * + * @param input text (i.e. submitted by a user) than may contain html + * @return "clean" version of input, with only valid, whitelisted html elements allowed + */ + public String filter(final String input) + { + reset(); + String s = input; + + s = escapeComments(s); + + s = balanceHTML(s); + + s = checkTags(s); + + s = processRemoveBlanks(s); + + // s = validateEntities(s); + + return s; + } + + public boolean isAlwaysMakeTags() + { + return alwaysMakeTags; + } + + public boolean isStripComments() + { + return stripComment; + } + + private String escapeComments(final String s) + { + final Matcher m = P_COMMENTS.matcher(s); + final StringBuffer buf = new StringBuffer(); + if (m.find()) + { + final String match = m.group(1); // (.*?) + m.appendReplacement(buf, Matcher.quoteReplacement("")); + } + m.appendTail(buf); + + return buf.toString(); + } + + private String balanceHTML(String s) + { + if (alwaysMakeTags) + { + // + // try and form html + // + s = regexReplace(P_END_ARROW, "", s); + // 不追加结束标签 + s = regexReplace(P_BODY_TO_END, "<$1>", s); + s = regexReplace(P_XML_CONTENT, "$1<$2", s); + + } + else + { + // + // escape stray brackets + // + s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); + s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); + + // + // the last regexp causes '<>' entities to appear + // (we need to do a lookahead assertion so that the last bracket can + // be used in the next pass of the regexp) + // + s = regexReplace(P_BOTH_ARROWS, "", s); + } + + return s; + } + + private String checkTags(String s) + { + Matcher m = P_TAGS.matcher(s); + + final StringBuffer buf = new StringBuffer(); + while (m.find()) + { + String replaceStr = m.group(1); + replaceStr = processTag(replaceStr); + m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); + } + m.appendTail(buf); + + // these get tallied in processTag + // (remember to reset before subsequent calls to filter method) + final StringBuilder sBuilder = new StringBuilder(buf.toString()); + for (String key : vTagCounts.keySet()) + { + for (int ii = 0; ii < vTagCounts.get(key); ii++) + { + sBuilder.append(""); + } + } + s = sBuilder.toString(); + + return s; + } + + private String processRemoveBlanks(final String s) + { + String result = s; + for (String tag : vRemoveBlanks) + { + if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) + { + P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); + } + result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); + if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) + { + P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); + } + result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); + } + + return result; + } + + private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) + { + Matcher m = regex_pattern.matcher(s); + return m.replaceAll(replacement); + } + + private String processTag(final String s) + { + // ending tags + Matcher m = P_END_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + if (allowed(name)) + { + if (!inArray(name, vSelfClosingTags)) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) - 1); + return ""; + } + } + } + } + + // starting tags + m = P_START_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + final String body = m.group(2); + String ending = m.group(3); + + // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); + if (allowed(name)) + { + final StringBuilder params = new StringBuilder(); + + final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); + final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); + final List paramNames = new ArrayList<>(); + final List paramValues = new ArrayList<>(); + while (m2.find()) + { + paramNames.add(m2.group(1)); // ([a-z0-9]+) + paramValues.add(m2.group(3)); // (.*?) + } + while (m3.find()) + { + paramNames.add(m3.group(1)); // ([a-z0-9]+) + paramValues.add(m3.group(3)); // ([^\"\\s']+) + } + + String paramName, paramValue; + for (int ii = 0; ii < paramNames.size(); ii++) + { + paramName = paramNames.get(ii).toLowerCase(); + paramValue = paramValues.get(ii); + + // debug( "paramName='" + paramName + "'" ); + // debug( "paramValue='" + paramValue + "'" ); + // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); + + if (allowedAttribute(name, paramName)) + { + if (inArray(paramName, vProtocolAtts)) + { + paramValue = processParamProtocol(paramValue); + } + params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\\\""); + } + } + + if (inArray(name, vSelfClosingTags)) + { + ending = " /"; + } + + if (inArray(name, vNeedClosingTags)) + { + ending = ""; + } + + if (ending == null || ending.length() < 1) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) + 1); + } + else + { + vTagCounts.put(name, 1); + } + } + else + { + ending = " /"; + } + return "<" + name + params + ending + ">"; + } + else + { + return ""; + } + } + + // comments + m = P_COMMENT.matcher(s); + if (!stripComment && m.find()) + { + return "<" + m.group() + ">"; + } + + return ""; + } + + private String processParamProtocol(String s) + { + s = decodeEntities(s); + final Matcher m = P_PROTOCOL.matcher(s); + if (m.find()) + { + final String protocol = m.group(1); + if (!inArray(protocol, vAllowedProtocols)) + { + // bad protocol, turn into local anchor link instead + s = "#" + s.substring(protocol.length() + 1); + if (s.startsWith("#//")) + { + s = "#" + s.substring(3); + } + } + } + + return s; + } + + private String decodeEntities(String s) + { + StringBuffer buf = new StringBuffer(); + + Matcher m = P_ENTITY.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.decode(match).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENTITY_UNICODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENCODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + s = validateEntities(s); + return s; + } + + private String validateEntities(final String s) + { + StringBuffer buf = new StringBuffer(); + + // validate entities throughout the string + Matcher m = P_VALID_ENTITIES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // ([^&;]*) + final String two = m.group(2); // (?=(;|&|$)) + m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); + } + m.appendTail(buf); + + return encodeQuotes(buf.toString()); + } + + private String encodeQuotes(final String s) + { + if (encodeQuotes) + { + StringBuffer buf = new StringBuffer(); + Matcher m = P_VALID_QUOTES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // (>|^) + final String two = m.group(2); // ([^<]+?) + final String three = m.group(3); // (<|$) + // 不替换双引号为",防止json格式无效 regexReplace(P_QUOTE, """, two) + m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); + } + m.appendTail(buf); + return buf.toString(); + } + else + { + return s; + } + } + + private String checkEntity(final String preamble, final String term) + { + + return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; + } + + private boolean isValidEntity(final String entity) + { + return inArray(entity, vAllowedEntities); + } + + private static boolean inArray(final String s, final String[] array) + { + for (String item : array) + { + if (item != null && item.equals(s)) + { + return true; + } + } + return false; + } + + private boolean allowed(final String name) + { + return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); + } + + private boolean allowedAttribute(final String name, final String paramName) + { + return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ip/IpUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ip/IpUtils.java new file mode 100644 index 0000000..874c157 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/ip/IpUtils.java @@ -0,0 +1,382 @@ +package com.zeroerr.common.core.utils.ip; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import javax.servlet.http.HttpServletRequest; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 获取IP方法 + * + * @author ruoyi + */ +public class IpUtils +{ + public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)"; + // 匹配 ip + public final static String REGX_IP = "((" + REGX_0_255 + "\\.){3}" + REGX_0_255 + ")"; + public final static String REGX_IP_WILDCARD = "(((\\*\\.){3}\\*)|(" + REGX_0_255 + "(\\.\\*){3})|(" + REGX_0_255 + "\\." + REGX_0_255 + ")(\\.\\*){2}" + "|((" + REGX_0_255 + "\\.){3}\\*))"; + // 匹配网段 + public final static String REGX_IP_SEG = "(" + REGX_IP + "\\-" + REGX_IP + ")"; + + /** + * 获取客户端IP + * + * @return IP地址 + */ + public static String getIpAddr() + { + return getIpAddr(ServletUtils.getRequest()); + } + + /** + * 获取客户端IP + * + * @param request 请求对象 + * @return IP地址 + */ + public static String getIpAddr(HttpServletRequest request) + { + if (request == null) + { + return "unknown"; + } + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("X-Forwarded-For"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("X-Real-IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getRemoteAddr(); + } + + return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param ip IP地址 + * @return 结果 + */ + public static boolean internalIp(String ip) + { + byte[] addr = textToNumericFormatV4(ip); + return internalIp(addr) || "127.0.0.1".equals(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param addr byte地址 + * @return 结果 + */ + private static boolean internalIp(byte[] addr) + { + if (StringUtils.isNull(addr) || addr.length < 2) + { + return true; + } + final byte b0 = addr[0]; + final byte b1 = addr[1]; + // 10.x.x.x/8 + final byte SECTION_1 = 0x0A; + // 172.16.x.x/12 + final byte SECTION_2 = (byte) 0xAC; + final byte SECTION_3 = (byte) 0x10; + final byte SECTION_4 = (byte) 0x1F; + // 192.168.x.x/16 + final byte SECTION_5 = (byte) 0xC0; + final byte SECTION_6 = (byte) 0xA8; + switch (b0) + { + case SECTION_1: + return true; + case SECTION_2: + if (b1 >= SECTION_3 && b1 <= SECTION_4) + { + return true; + } + case SECTION_5: + switch (b1) + { + case SECTION_6: + return true; + } + default: + return false; + } + } + + /** + * 将IPv4地址转换成字节 + * + * @param text IPv4地址 + * @return byte 字节 + */ + public static byte[] textToNumericFormatV4(String text) + { + if (text.length() == 0) + { + return null; + } + + byte[] bytes = new byte[4]; + String[] elements = text.split("\\.", -1); + try + { + long l; + int i; + switch (elements.length) + { + case 1: + l = Long.parseLong(elements[0]); + if ((l < 0L) || (l > 4294967295L)) + { + return null; + } + bytes[0] = (byte) (int) (l >> 24 & 0xFF); + bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 2: + l = Integer.parseInt(elements[0]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[0] = (byte) (int) (l & 0xFF); + l = Integer.parseInt(elements[1]); + if ((l < 0L) || (l > 16777215L)) + { + return null; + } + bytes[1] = (byte) (int) (l >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 3: + for (i = 0; i < 2; ++i) + { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + l = Integer.parseInt(elements[2]); + if ((l < 0L) || (l > 65535L)) + { + return null; + } + bytes[2] = (byte) (int) (l >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 4: + for (i = 0; i < 4; ++i) + { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + break; + default: + return null; + } + } + catch (NumberFormatException e) + { + return null; + } + return bytes; + } + + /** + * 获取IP地址 + * + * @return 本地IP地址 + */ + public static String getHostIp() + { + try + { + return InetAddress.getLocalHost().getHostAddress(); + } + catch (UnknownHostException e) + { + } + return "127.0.0.1"; + } + + /** + * 获取主机名 + * + * @return 本地主机名 + */ + public static String getHostName() + { + try + { + return InetAddress.getLocalHost().getHostName(); + } + catch (UnknownHostException e) + { + } + return "未知"; + } + + /** + * 从多级反向代理中获得第一个非unknown IP地址 + * + * @param ip 获得的IP地址 + * @return 第一个非unknown IP地址 + */ + public static String getMultistageReverseProxyIp(String ip) + { + // 多级反向代理检测 + if (ip != null && ip.indexOf(",") > 0) + { + final String[] ips = ip.trim().split(","); + for (String subIp : ips) + { + if (false == isUnknown(subIp)) + { + ip = subIp; + break; + } + } + } + return StringUtils.substring(ip, 0, 255); + } + + /** + * 检测给定字符串是否为未知,多用于检测HTTP请求相关 + * + * @param checkString 被检测的字符串 + * @return 是否未知 + */ + public static boolean isUnknown(String checkString) + { + return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); + } + + /** + * 是否为IP + */ + public static boolean isIP(String ip) + { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP); + } + + /** + * 是否为IP,或 *为间隔的通配符地址 + */ + public static boolean isIpWildCard(String ip) + { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD); + } + + /** + * 检测参数是否在ip通配符里 + */ + public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip) + { + String[] s1 = ipWildCard.split("\\."); + String[] s2 = ip.split("\\."); + boolean isMatchedSeg = true; + for (int i = 0; i < s1.length && !s1[i].equals("*"); i++) + { + if (!s1[i].equals(s2[i])) + { + isMatchedSeg = false; + break; + } + } + return isMatchedSeg; + } + + /** + * 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串 + */ + public static boolean isIPSegment(String ipSeg) + { + return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG); + } + + /** + * 判断ip是否在指定网段中 + */ + public static boolean ipIsInNetNoCheck(String iparea, String ip) + { + int idx = iparea.indexOf('-'); + String[] sips = iparea.substring(0, idx).split("\\."); + String[] sipe = iparea.substring(idx + 1).split("\\."); + String[] sipt = ip.split("\\."); + long ips = 0L, ipe = 0L, ipt = 0L; + for (int i = 0; i < 4; ++i) + { + ips = ips << 8 | Integer.parseInt(sips[i]); + ipe = ipe << 8 | Integer.parseInt(sipe[i]); + ipt = ipt << 8 | Integer.parseInt(sipt[i]); + } + if (ips > ipe) + { + long t = ips; + ips = ipe; + ipe = t; + } + return ips <= ipt && ipt <= ipe; + } + + /** + * 校验ip是否符合过滤串规则 + * + * @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99` + * @param ip 校验IP地址 + * @return boolean 结果 + */ + public static boolean isMatchedIp(String filter, String ip) + { + if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip)) + { + return false; + } + String[] ips = filter.split(";"); + for (String iStr : ips) + { + if (isIP(iStr) && iStr.equals(ip)) + { + return true; + } + else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip)) + { + return true; + } + else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip)) + { + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelHandlerAdapter.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelHandlerAdapter.java new file mode 100644 index 0000000..d81a08c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelHandlerAdapter.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.core.utils.poi; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Workbook; + +/** + * Excel数据格式处理适配器 + * + * @author ruoyi + */ +public interface ExcelHandlerAdapter +{ + /** + * 格式化 + * + * @param value 单元格数据值 + * @param args excel注解args参数组 + * @param cell 单元格对象 + * @param wb 工作簿对象 + * + * @return 处理后的值 + */ + Object format(Object value, String[] args, Cell cell, Workbook wb); +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelUtil.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelUtil.java new file mode 100644 index 0000000..b369c44 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/poi/ExcelUtil.java @@ -0,0 +1,1539 @@ +package com.zeroerr.common.core.utils.poi; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.RegExUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.ClientAnchor; +import org.apache.poi.ss.usermodel.DataFormat; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Drawing; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Name; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.annotation.Excel.Type; +import com.zeroerr.common.core.annotation.Excels; +import com.zeroerr.common.core.exception.UtilException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.file.FileTypeUtils; +import com.zeroerr.common.core.utils.file.ImageUtils; +import com.zeroerr.common.core.utils.reflect.ReflectUtils; + +/** + * Excel相关处理 + * + * @author ruoyi + */ +public class ExcelUtil +{ + private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); + + public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; + + public static final String[] FORMULA_STR = { "=", "-", "+", "@" }; + + /** + * Excel sheet最大行数,默认65536 + */ + public static final int sheetSize = 65536; + + /** + * 工作表名称 + */ + private String sheetName; + + /** + * 导出类型(EXPORT:导出数据;IMPORT:导入模板) + */ + private Type type; + + /** + * 工作薄对象 + */ + private Workbook wb; + + /** + * 工作表对象 + */ + private Sheet sheet; + + /** + * 样式列表 + */ + private Map styles; + + /** + * 导入导出数据列表 + */ + private List list; + + /** + * 注解列表 + */ + private List fields; + + /** + * 当前行号 + */ + private int rownum; + + /** + * 标题 + */ + private String title; + + /** + * 最大高度 + */ + private short maxHeight; + + /** + * 合并后最后行数 + */ + private int subMergedLastRowNum = 0; + + /** + * 合并后开始行数 + */ + private int subMergedFirstRowNum = 1; + + /** + * 对象的子列表方法 + */ + private Method subMethod; + + /** + * 对象的子列表属性 + */ + private List subFields; + + /** + * 统计列表 + */ + private Map statistics = new HashMap(); + + /** + * 数字格式 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + + /** + * 实体对象 + */ + public Class clazz; + + /** + * 需要排除列属性 + */ + public String[] excludeFields; + + public ExcelUtil(Class clazz) + { + this.clazz = clazz; + } + + /** + * 隐藏Excel中列属性 + * + * @param fields 列属性名 示例[单个"name"/多个"id","name"] + * @throws Exception + */ + public void hideColumn(String... fields) + { + this.excludeFields = fields; + } + + public void init(List list, String sheetName, String title, Type type) + { + if (list == null) + { + list = new ArrayList(); + } + this.list = list; + this.sheetName = sheetName; + this.type = type; + this.title = title; + createExcelField(); + createWorkbook(); + createTitle(); + createSubHead(); + } + + /** + * 创建excel第一行标题 + */ + public void createTitle() + { + if (StringUtils.isNotEmpty(title)) + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + int titleLastCol = this.fields.size() - 1; + if (isSubList()) + { + titleLastCol = titleLastCol + subFields.size() - 1; + } + Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0); + titleRow.setHeightInPoints(30); + Cell titleCell = titleRow.createCell(0); + titleCell.setCellStyle(styles.get("title")); + titleCell.setCellValue(title); + sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol)); + } + } + + /** + * 创建对象的子列表名称 + */ + public void createSubHead() + { + if (isSubList()) + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + Row subRow = sheet.createRow(rownum); + int excelNum = 0; + for (Object[] objects : fields) + { + Excel attr = (Excel) objects[1]; + Cell headCell1 = subRow.createCell(excelNum); + headCell1.setCellValue(attr.name()); + headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); + excelNum++; + } + int headFirstRow = excelNum - 1; + int headLastRow = headFirstRow + subFields.size() - 1; + if (headLastRow > headFirstRow) + { + sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow)); + } + rownum++; + } + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(InputStream is) + { + List list = null; + try + { + list = importExcel(is, 0); + } + catch (Exception e) + { + log.error("导入Excel异常{}", e.getMessage()); + throw new UtilException(e.getMessage()); + } + finally + { + IOUtils.closeQuietly(is); + } + return list; + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @param titleNum 标题占用行数 + * @return 转换后集合 + */ + public List importExcel(InputStream is, int titleNum) throws Exception + { + return importExcel(StringUtils.EMPTY, is, titleNum); + } + + /** + * 对excel表单指定表格索引名转换成list + * + * @param sheetName 表格索引名 + * @param titleNum 标题占用行数 + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception + { + this.type = Type.IMPORT; + this.wb = WorkbookFactory.create(is); + List list = new ArrayList(); + // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet + Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0); + if (sheet == null) + { + throw new IOException("文件sheet不存在"); + } + + // 获取最后一个非空行的行下标,比如总行数为n,则返回的为n-1 + int rows = sheet.getLastRowNum(); + if (rows > 0) + { + // 定义一个map用于存放excel列的序号和field. + Map cellMap = new HashMap(); + // 获取表头 + Row heard = sheet.getRow(titleNum); + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) + { + Cell cell = heard.getCell(i); + if (StringUtils.isNotNull(cell)) + { + String value = this.getCellValue(heard, i).toString(); + cellMap.put(value, i); + } + else + { + cellMap.put(null, i); + } + } + // 有数据时才处理 得到类的所有field. + List fields = this.getFields(); + Map fieldsMap = new HashMap(); + for (Object[] objects : fields) + { + Excel attr = (Excel) objects[1]; + Integer column = cellMap.get(attr.name()); + if (column != null) + { + fieldsMap.put(column, objects); + } + } + for (int i = titleNum + 1; i <= rows; i++) + { + // 从第2行开始取数据,默认第一行是表头. + Row row = sheet.getRow(i); + // 判断当前行是否是空行 + if (isRowEmpty(row)) + { + continue; + } + T entity = null; + for (Map.Entry entry : fieldsMap.entrySet()) + { + Object val = this.getCellValue(row, entry.getKey()); + + // 如果不存在实例则新建. + entity = (entity == null ? clazz.newInstance() : entity); + // 从map中得到对应列的field. + Field field = (Field) entry.getValue()[0]; + Excel attr = (Excel) entry.getValue()[1]; + // 取得类型,并根据对象类型设置值. + Class fieldType = field.getType(); + if (String.class == fieldType) + { + String s = Convert.toStr(val); + if (StringUtils.endsWith(s, ".0")) + { + val = StringUtils.substringBefore(s, ".0"); + } + else + { + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if (StringUtils.isNotEmpty(dateFormat)) + { + val = parseDateToStr(dateFormat, val); + } + else + { + val = Convert.toStr(val); + } + } + } + else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) + { + val = Convert.toInt(val); + } + else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) + { + val = Convert.toLong(val); + } + else if (Double.TYPE == fieldType || Double.class == fieldType) + { + val = Convert.toDouble(val); + } + else if (Float.TYPE == fieldType || Float.class == fieldType) + { + val = Convert.toFloat(val); + } + else if (BigDecimal.class == fieldType) + { + val = Convert.toBigDecimal(val); + } + else if (Date.class == fieldType) + { + if (val instanceof String) + { + val = DateUtils.parseDate(val); + } + else if (val instanceof Double) + { + val = DateUtil.getJavaDate((Double) val); + } + } + else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) + { + val = Convert.toBool(val, false); + } + if (StringUtils.isNotNull(fieldType)) + { + String propertyName = field.getName(); + if (StringUtils.isNotEmpty(attr.targetAttr())) + { + propertyName = field.getName() + "." + attr.targetAttr(); + } + if (StringUtils.isNotEmpty(attr.readConverterExp())) + { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + val = dataFormatHandlerAdapter(val, attr, null); + } + ReflectUtils.invokeSetter(entity, propertyName, val); + } + } + list.add(entity); + } + } + return list; + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param response 返回数据 + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @return 结果 + */ + public void exportExcel(HttpServletResponse response, List list, String sheetName) + { + exportExcel(response, list, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param response 返回数据 + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public void exportExcel(HttpServletResponse response, List list, String sheetName, String title) + { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + this.init(list, sheetName, title, Type.EXPORT); + exportExcel(response); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @return 结果 + */ + public void importTemplateExcel(HttpServletResponse response, String sheetName) + { + importTemplateExcel(response, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) + { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + this.init(null, sheetName, title, Type.IMPORT); + exportExcel(response); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @return 结果 + */ + public void exportExcel(HttpServletResponse response) + { + try + { + writeSheet(); + wb.write(response.getOutputStream()); + } + catch (Exception e) + { + log.error("导出Excel异常{}", e.getMessage()); + } + finally + { + IOUtils.closeQuietly(wb); + } + } + + /** + * 创建写入数据到Sheet + */ + public void writeSheet() + { + // 取出一共有多少个sheet. + int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize)); + for (int index = 0; index < sheetNo; index++) + { + createSheet(sheetNo, index); + + // 产生一行 + Row row = sheet.createRow(rownum); + int column = 0; + // 写入各个字段的列头名称 + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + if (Collection.class.isAssignableFrom(field.getType())) + { + for (Field subField : subFields) + { + Excel subExcel = subField.getAnnotation(Excel.class); + this.createHeadCell(subExcel, row, column++); + } + } + else + { + this.createHeadCell(excel, row, column++); + } + } + if (Type.EXPORT.equals(type)) + { + fillExcelData(index, row); + addStatisticsRow(); + } + } + } + + /** + * 填充excel数据 + * + * @param index 序号 + * @param row 单元格行 + */ + @SuppressWarnings("unchecked") + public void fillExcelData(int index, Row row) + { + int startNo = index * sheetSize; + int endNo = Math.min(startNo + sheetSize, list.size()); + int rowNo = (1 + rownum) - startNo; + for (int i = startNo; i < endNo; i++) + { + rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo; + row = sheet.createRow(rowNo); + // 得到导出对象. + T vo = (T) list.get(i); + Collection subList = null; + if (isSubList()) + { + if (isSubListValue(vo)) + { + subList = getListCellValue(vo); + subMergedLastRowNum = subMergedLastRowNum + subList.size(); + } + else + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + } + } + int column = 0; + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) + { + boolean subFirst = false; + for (Object obj : subList) + { + if (subFirst) + { + rowNo++; + row = sheet.createRow(rowNo); + } + List subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class); + int subIndex = 0; + for (Field subField : subFields) + { + if (subField.isAnnotationPresent(Excel.class)) + { + subField.setAccessible(true); + Excel attr = subField.getAnnotation(Excel.class); + this.addCell(attr, row, (T) obj, subField, column + subIndex); + } + subIndex++; + } + subFirst = true; + } + this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size(); + } + else + { + this.addCell(excel, row, vo, field, column++); + } + } + } + } + + /** + * 创建表格样式 + * + * @param wb 工作薄对象 + * @return 样式列表 + */ + private Map createStyles(Workbook wb) + { + // 写入各条记录,每条记录对应excel表中的一行 + Map styles = new HashMap(); + CellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font titleFont = wb.createFont(); + titleFont.setFontName("Arial"); + titleFont.setFontHeightInPoints((short) 16); + titleFont.setBold(true); + style.setFont(titleFont); + DataFormat dataFormat = wb.createDataFormat(); + style.setDataFormat(dataFormat.getFormat("@")); + styles.put("title", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + style.setFont(dataFont); + styles.put("data", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font totalFont = wb.createFont(); + totalFont.setFontName("Arial"); + totalFont.setFontHeightInPoints((short) 10); + style.setFont(totalFont); + styles.put("total", style); + + styles.putAll(annotationHeaderStyles(wb, styles)); + + styles.putAll(annotationDataStyles(wb)); + + return styles; + } + + /** + * 根据Excel注解创建表格头样式 + * + * @param wb 工作薄对象 + * @return 自定义样式列表 + */ + private Map annotationHeaderStyles(Workbook wb, Map styles) + { + Map headerStyles = new HashMap(); + for (Object[] os : fields) + { + Excel excel = (Excel) os[1]; + String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor()); + if (!headerStyles.containsKey(key)) + { + CellStyle style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setFillForegroundColor(excel.headerBackgroundColor().index); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + Font headerFont = wb.createFont(); + headerFont.setFontName("Arial"); + headerFont.setFontHeightInPoints((short) 10); + headerFont.setBold(true); + headerFont.setColor(excel.headerColor().index); + style.setFont(headerFont); + // 设置表格头单元格文本形式 + DataFormat dataFormat = wb.createDataFormat(); + style.setDataFormat(dataFormat.getFormat("@")); + headerStyles.put(key, style); + } + } + return headerStyles; + } + + /** + * 根据Excel注解创建表格列样式 + * + * @param wb 工作薄对象 + * @return 自定义样式列表 + */ + private Map annotationDataStyles(Workbook wb) + { + Map styles = new HashMap(); + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + if (Collection.class.isAssignableFrom(field.getType())) + { + ParameterizedType pt = (ParameterizedType) field.getGenericType(); + Class subClass = (Class) pt.getActualTypeArguments()[0]; + List subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class); + for (Field subField : subFields) + { + Excel subExcel = subField.getAnnotation(Excel.class); + annotationDataStyles(styles, subField, subExcel); + } + } + else + { + annotationDataStyles(styles, field, excel); + } + } + return styles; + } + + /** + * 根据Excel注解创建表格列样式 + * + * @param styles 自定义样式列表 + * @param field 属性列信息 + * @param excel 注解信息 + */ + public void annotationDataStyles(Map styles, Field field, Excel excel) + { + String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType()); + if (!styles.containsKey(key)) + { + CellStyle style = wb.createCellStyle(); + style.setAlignment(excel.align()); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + style.setFillForegroundColor(excel.backgroundColor().getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + dataFont.setColor(excel.color().index); + style.setFont(dataFont); + if (ColumnType.TEXT == excel.cellType()) + { + DataFormat dataFormat = wb.createDataFormat(); + style.setDataFormat(dataFormat.getFormat("@")); + } + styles.put(key, style); + } + } + + /** + * 创建单元格 + */ + public Cell createHeadCell(Excel attr, Row row, int column) + { + // 创建列 + Cell cell = row.createCell(column); + // 写入列信息 + cell.setCellValue(attr.name()); + setDataValidation(attr, row, column); + cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); + if (isSubList()) + { + // 填充默认样式,防止合并单元格样式失效 + sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType()))); + if (attr.needMerge()) + { + sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column)); + } + } + return cell; + } + + /** + * 设置单元格信息 + * + * @param value 单元格值 + * @param attr 注解相关 + * @param cell 单元格信息 + */ + public void setCellVo(Object value, Excel attr, Cell cell) + { + if (ColumnType.STRING == attr.cellType() || ColumnType.TEXT == attr.cellType()) + { + String cellValue = Convert.toStr(value); + // 对于任何以表达式触发字符 =-+@开头的单元格,直接使用tab字符作为前缀,防止CSV注入。 + if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) + { + cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0"); + } + if (value instanceof Collection && StringUtils.equals("[]", cellValue)) + { + cellValue = StringUtils.EMPTY; + } + cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix()); + } + else if (ColumnType.NUMERIC == attr.cellType()) + { + if (StringUtils.isNotNull(value)) + { + cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + } + } + else if (ColumnType.IMAGE == attr.cellType()) + { + ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1); + String imagePath = Convert.toStr(value); + if (StringUtils.isNotEmpty(imagePath)) + { + byte[] data = ImageUtils.getImage(imagePath); + getDrawingPatriarch(cell.getSheet()).createPicture(anchor, + cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); + } + } + } + + /** + * 获取画布 + */ + public static Drawing getDrawingPatriarch(Sheet sheet) + { + if (sheet.getDrawingPatriarch() == null) + { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } + + /** + * 获取图片类型,设置图片插入类型 + */ + public int getImageType(byte[] value) + { + String type = FileTypeUtils.getFileExtendName(value); + if ("JPG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_JPEG; + } + else if ("PNG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_PNG; + } + return Workbook.PICTURE_TYPE_JPEG; + } + + /** + * 创建表格样式 + */ + public void setDataValidation(Excel attr, Row row, int column) + { + if (attr.name().indexOf("注:") >= 0) + { + sheet.setColumnWidth(column, 6000); + } + else + { + // 设置列宽 + sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); + } + if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) + { + if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) + { + // 如果下拉数大于15或字符串长度大于255,则使用一个新sheet存储,避免生成的模板下拉值获取不到 + setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); + } + else + { + // 提示信息或只能选择不能输入的列内容. + setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); + } + } + } + + /** + * 添加单元格 + */ + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) + { + Cell cell = null; + try + { + // 设置行高 + row.setHeight(maxHeight); + // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列. + if (attr.isExport()) + { + // 创建cell + cell = row.createCell(column); + if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) + { + CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column); + sheet.addMergedRegion(cellAddress); + } + cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType()))); + + // 用于读取对象中的属性 + Object value = getTargetValue(vo, field, attr); + String dateFormat = attr.dateFormat(); + String readConverterExp = attr.readConverterExp(); + String separator = attr.separator(); + if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) + { + cell.setCellValue(parseDateToStr(dateFormat, value)); + } + else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); + } + else if (value instanceof BigDecimal && -1 != attr.scale()) + { + cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell)); + } + else + { + // 设置列类型 + setCellVo(value, attr, cell); + } + addStatisticsData(column, Convert.toStr(value), attr); + } + } + catch (Exception e) + { + log.error("导出Excel失败{}", e); + } + return cell; + } + + /** + * 设置 POI XSSFSheet 单元格提示或选择框 + * + * @param sheet 表单 + * @param textlist 下拉框显示的内容 + * @param promptContent 提示内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + */ + public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, + int firstCol, int endCol) + { + DataValidationHelper helper = sheet.getDataValidationHelper(); + DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1"); + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + DataValidation dataValidation = helper.createValidation(constraint, regions); + if (StringUtils.isNotEmpty(promptContent)) + { + // 如果设置了提示信息则鼠标放上去提示 + dataValidation.createPromptBox("", promptContent); + dataValidation.setShowPromptBox(true); + } + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) + { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } + else + { + dataValidation.setSuppressDropDownArrow(false); + } + sheet.addValidationData(dataValidation); + } + + /** + * 设置某些列的值只能输入预制的数据,显示下拉框(兼容超出一定数量的下拉框). + * + * @param sheet 要设置的sheet. + * @param textlist 下拉框显示的内容 + * @param promptContent 提示内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + */ + public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) + { + String hideSheetName = "combo_" + firstCol + "_" + endCol; + Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据 + for (int i = 0; i < textlist.length; i++) + { + hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]); + } + // 创建名称,可被其他单元格引用 + Name name = wb.createName(); + name.setNameName(hideSheetName + "_data"); + name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length); + DataValidationHelper helper = sheet.getDataValidationHelper(); + // 加载下拉列表内容 + DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data"); + // 设置数据有效性加载在哪个单元格上,四个参数分别是:起始行、终止行、起始列、终止列 + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + // 数据有效性对象 + DataValidation dataValidation = helper.createValidation(constraint, regions); + if (StringUtils.isNotEmpty(promptContent)) + { + // 如果设置了提示信息则鼠标放上去提示 + dataValidation.createPromptBox("", promptContent); + dataValidation.setShowPromptBox(true); + } + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) + { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } + else + { + dataValidation.setSuppressDropDownArrow(false); + } + + sheet.addValidationData(dataValidation); + // 设置hiddenSheet隐藏 + wb.setSheetHidden(wb.getSheetIndex(hideSheet), true); + } + + /** + * 解析导出值 0=男,1=女,2=未知 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String convertByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[0].equals(value)) + { + propertyString.append(itemArray[1] + separator); + break; + } + } + } + else + { + if (itemArray[0].equals(propertyValue)) + { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 反向解析值 男=0,女=1,未知=2 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[1].equals(value)) + { + propertyString.append(itemArray[0] + separator); + break; + } + } + } + else + { + if (itemArray[1].equals(propertyValue)) + { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 数据处理器 + * + * @param value 数据值 + * @param excel 数据注解 + * @return + */ + public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell) + { + try + { + Object instance = excel.handler().newInstance(); + Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class }); + value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb); + } + catch (Exception e) + { + log.error("不能格式化数据 " + excel.handler(), e.getMessage()); + } + return Convert.toStr(value); + } + + /** + * 合计统计信息 + */ + private void addStatisticsData(Integer index, String text, Excel entity) + { + if (entity != null && entity.isStatistics()) + { + Double temp = 0D; + if (!statistics.containsKey(index)) + { + statistics.put(index, temp); + } + try + { + temp = Double.valueOf(text); + } + catch (NumberFormatException e) + { + } + statistics.put(index, statistics.get(index) + temp); + } + } + + /** + * 创建统计行 + */ + public void addStatisticsRow() + { + if (statistics.size() > 0) + { + Row row = sheet.createRow(sheet.getLastRowNum() + 1); + Set keys = statistics.keySet(); + Cell cell = row.createCell(0); + cell.setCellStyle(styles.get("total")); + cell.setCellValue("合计"); + + for (Integer key : keys) + { + cell = row.createCell(key); + cell.setCellStyle(styles.get("total")); + cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); + } + statistics.clear(); + } + } + + /** + * 获取bean中的属性值 + * + * @param vo 实体对象 + * @param field 字段 + * @param excel 注解 + * @return 最终的属性值 + * @throws Exception + */ + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception + { + Object o = field.get(vo); + if (StringUtils.isNotEmpty(excel.targetAttr())) + { + String target = excel.targetAttr(); + if (target.contains(".")) + { + String[] targets = target.split("[.]"); + for (String name : targets) + { + o = getValue(o, name); + } + } + else + { + o = getValue(o, target); + } + } + return o; + } + + /** + * 以类的属性的get方法方法形式获取值 + * + * @param o + * @param name + * @return value + * @throws Exception + */ + private Object getValue(Object o, String name) throws Exception + { + if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) + { + Class clazz = o.getClass(); + Field field = clazz.getDeclaredField(name); + field.setAccessible(true); + o = field.get(o); + } + return o; + } + + /** + * 得到所有定义字段 + */ + private void createExcelField() + { + this.fields = getFields(); + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); + this.maxHeight = getRowHeight(); + } + + /** + * 获取字段注解信息 + */ + public List getFields() + { + List fields = new ArrayList(); + List tempFields = new ArrayList<>(); + tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); + tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); + for (Field field : tempFields) + { + if (!ArrayUtils.contains(this.excludeFields, field.getName())) + { + // 单注解 + if (field.isAnnotationPresent(Excel.class)) + { + Excel attr = field.getAnnotation(Excel.class); + if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + { + field.setAccessible(true); + fields.add(new Object[] { field, attr }); + } + if (Collection.class.isAssignableFrom(field.getType())) + { + subMethod = getSubMethod(field.getName(), clazz); + ParameterizedType pt = (ParameterizedType) field.getGenericType(); + Class subClass = (Class) pt.getActualTypeArguments()[0]; + this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class); + } + } + + // 多注解 + if (field.isAnnotationPresent(Excels.class)) + { + Excels attrs = field.getAnnotation(Excels.class); + Excel[] excels = attrs.value(); + for (Excel attr : excels) + { + if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr()) + && (attr != null && (attr.type() == Type.ALL || attr.type() == type))) + { + field.setAccessible(true); + fields.add(new Object[] { field, attr }); + } + } + } + } + } + return fields; + } + + /** + * 根据注解获取最大行高 + */ + public short getRowHeight() + { + double maxHeight = 0; + for (Object[] os : this.fields) + { + Excel excel = (Excel) os[1]; + maxHeight = Math.max(maxHeight, excel.height()); + } + return (short) (maxHeight * 20); + } + + /** + * 创建一个工作簿 + */ + public void createWorkbook() + { + this.wb = new SXSSFWorkbook(500); + this.sheet = wb.createSheet(); + wb.setSheetName(0, sheetName); + this.styles = createStyles(wb); + } + + /** + * 创建工作表 + * + * @param sheetNo sheet数量 + * @param index 序号 + */ + public void createSheet(int sheetNo, int index) + { + // 设置工作表的名称. + if (sheetNo > 1 && index > 0) + { + this.sheet = wb.createSheet(); + this.createTitle(); + wb.setSheetName(index, sheetName + index); + } + } + + /** + * 获取单元格值 + * + * @param row 获取的行 + * @param column 获取单元格列号 + * @return 单元格值 + */ + public Object getCellValue(Row row, int column) + { + if (row == null) + { + return row; + } + Object val = ""; + try + { + Cell cell = row.getCell(column); + if (StringUtils.isNotNull(cell)) + { + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) + { + val = cell.getNumericCellValue(); + if (DateUtil.isCellDateFormatted(cell)) + { + val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 + } + else + { + if ((Double) val % 1 != 0) + { + val = new BigDecimal(val.toString()); + } + else + { + val = new DecimalFormat("0").format(val); + } + } + } + else if (cell.getCellType() == CellType.STRING) + { + val = cell.getStringCellValue(); + } + else if (cell.getCellType() == CellType.BOOLEAN) + { + val = cell.getBooleanCellValue(); + } + else if (cell.getCellType() == CellType.ERROR) + { + val = cell.getErrorCellValue(); + } + + } + } + catch (Exception e) + { + return val; + } + return val; + } + + /** + * 判断是否是空行 + * + * @param row 判断的行 + * @return + */ + private boolean isRowEmpty(Row row) + { + if (row == null) + { + return true; + } + for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) + { + Cell cell = row.getCell(i); + if (cell != null && cell.getCellType() != CellType.BLANK) + { + return false; + } + } + return true; + } + + /** + * 格式化不同类型的日期对象 + * + * @param dateFormat 日期格式 + * @param val 被格式化的日期对象 + * @return 格式化后的日期字符 + */ + public String parseDateToStr(String dateFormat, Object val) + { + if (val == null) + { + return ""; + } + String str; + if (val instanceof Date) + { + str = DateUtils.parseDateToStr(dateFormat, (Date) val); + } + else if (val instanceof LocalDateTime) + { + str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val)); + } + else if (val instanceof LocalDate) + { + str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val)); + } + else + { + str = val.toString(); + } + return str; + } + + /** + * 是否有对象的子列表 + */ + public boolean isSubList() + { + return StringUtils.isNotNull(subFields) && subFields.size() > 0; + } + + /** + * 是否有对象的子列表,集合不为空 + */ + public boolean isSubListValue(T vo) + { + return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0; + } + + /** + * 获取集合的值 + */ + public Collection getListCellValue(Object obj) + { + Object value; + try + { + value = subMethod.invoke(obj, new Object[] {}); + } + catch (Exception e) + { + return new ArrayList(); + } + return (Collection) value; + } + + /** + * 获取对象的子列表方法 + * + * @param name 名称 + * @param pojoClass 类对象 + * @return 子列表方法 + */ + public Method getSubMethod(String name, Class pojoClass) + { + StringBuffer getMethodName = new StringBuffer("get"); + getMethodName.append(name.substring(0, 1).toUpperCase()); + getMethodName.append(name.substring(1)); + Method method = null; + try + { + method = pojoClass.getMethod(getMethodName.toString(), new Class[] {}); + } + catch (Exception e) + { + log.error("获取对象异常{}", e.getMessage()); + } + return method; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/reflect/ReflectUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/reflect/ReflectUtils.java new file mode 100644 index 0000000..218cf88 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/reflect/ReflectUtils.java @@ -0,0 +1,410 @@ +package com.zeroerr.common.core.utils.reflect; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Date; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.DateUtils; + +/** + * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. + * + * @author ruoyi + */ +@SuppressWarnings("rawtypes") +public class ReflectUtils +{ + private static final String SETTER_PREFIX = "set"; + + private static final String GETTER_PREFIX = "get"; + + private static final String CGLIB_CLASS_SEPARATOR = "$$"; + + private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); + + /** + * 调用Getter方法. + * 支持多级,如:对象名.对象名.方法 + */ + @SuppressWarnings("unchecked") + public static E invokeGetter(Object obj, String propertyName) + { + Object object = obj; + for (String name : StringUtils.split(propertyName, ".")) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + return (E) object; + } + + /** + * 调用Setter方法, 仅匹配方法名。 + * 支持多级,如:对象名.对象名.方法 + */ + public static void invokeSetter(Object obj, String propertyName, E value) + { + Object object = obj; + String[] names = StringUtils.split(propertyName, "."); + for (int i = 0; i < names.length; i++) + { + if (i < names.length - 1) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + else + { + String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); + invokeMethodByName(object, setterMethodName, new Object[] { value }); + } + } + } + + /** + * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数. + */ + @SuppressWarnings("unchecked") + public static E getFieldValue(final Object obj, final String fieldName) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + logger.debug("在 [" + obj.getClass() + "] 中,没有找到 [" + fieldName + "] 字段 "); + return null; + } + E result = null; + try + { + result = (E) field.get(obj); + } + catch (IllegalAccessException e) + { + logger.error("不可能抛出的异常{}", e.getMessage()); + } + return result; + } + + /** + * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数. + */ + public static void setFieldValue(final Object obj, final String fieldName, final E value) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中,没有找到 [" + fieldName + "] 字段 "); + logger.debug("在 [" + obj.getClass() + "] 中,没有找到 [" + fieldName + "] 字段 "); + return; + } + try + { + field.set(obj, value); + } + catch (IllegalAccessException e) + { + logger.error("不可能抛出的异常: {}", e.getMessage()); + } + } + + /** + * 直接调用对象方法, 无视private/protected修饰符. + * 用于一次性调用的情况,否则应使用getAccessibleMethod()函数获得Method后反复调用. + * 同时匹配方法名+参数类型, + */ + @SuppressWarnings("unchecked") + public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, + final Object[] args) + { + if (obj == null || methodName == null) + { + return null; + } + Method method = getAccessibleMethod(obj, methodName, parameterTypes); + if (method == null) + { + logger.debug("在 [" + obj.getClass() + "] 中,没有找到 [" + methodName + "] 方法 "); + return null; + } + try + { + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 直接调用对象方法, 无视private/protected修饰符, + * 用于一次性调用的情况,否则应使用getAccessibleMethodByName()函数获得Method后反复调用. + * 只匹配函数名,如果有多个同名函数调用第一个。 + */ + @SuppressWarnings("unchecked") + public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) + { + Method method = getAccessibleMethodByName(obj, methodName, args.length); + if (method == null) + { + // 如果为空不报错,直接返回空。 + logger.debug("在 [" + obj.getClass() + "] 中,没有找到 [" + methodName + "] 方法 "); + return null; + } + try + { + // 类型转换(将参数数据类型转换为目标方法参数类型) + Class[] cs = method.getParameterTypes(); + for (int i = 0; i < cs.length; i++) + { + if (args[i] != null && !args[i].getClass().equals(cs[i])) + { + if (cs[i] == String.class) + { + args[i] = Convert.toStr(args[i]); + if (StringUtils.endsWith((String) args[i], ".0")) + { + args[i] = StringUtils.substringBefore((String) args[i], ".0"); + } + } + else if (cs[i] == Integer.class) + { + args[i] = Convert.toInt(args[i]); + } + else if (cs[i] == Long.class) + { + args[i] = Convert.toLong(args[i]); + } + else if (cs[i] == Double.class) + { + args[i] = Convert.toDouble(args[i]); + } + else if (cs[i] == Float.class) + { + args[i] = Convert.toFloat(args[i]); + } + else if (cs[i] == Date.class) + { + if (args[i] instanceof String) + { + args[i] = DateUtils.parseDate(args[i]); + } + else + { + args[i] = DateUtil.getJavaDate((Double) args[i]); + } + } + else if (cs[i] == boolean.class || cs[i] == Boolean.class) + { + args[i] = Convert.toBool(args[i]); + } + } + } + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + */ + public static Field getAccessibleField(final Object obj, final String fieldName) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(fieldName, "fieldName can't be blank"); + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) + { + try + { + Field field = superClass.getDeclaredField(fieldName); + makeAccessible(field); + return field; + } + catch (NoSuchFieldException e) + { + continue; + } + } + return null; + } + + /** + * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + * 匹配函数名+参数类型。 + * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethod(final Object obj, final String methodName, + final Class... parameterTypes) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + try + { + Method method = searchType.getDeclaredMethod(methodName, parameterTypes); + makeAccessible(method); + return method; + } + catch (NoSuchMethodException e) + { + continue; + } + } + return null; + } + + /** + * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + * 只匹配函数名。 + * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + Method[] methods = searchType.getDeclaredMethods(); + for (Method method : methods) + { + if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) + { + makeAccessible(method); + return method; + } + } + } + return null; + } + + /** + * 改变private/protected的方法为public,尽量不调用实际改动的语句,避免JDK的SecurityManager抱怨。 + */ + public static void makeAccessible(Method method) + { + if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) + && !method.isAccessible()) + { + method.setAccessible(true); + } + } + + /** + * 改变private/protected的成员变量为public,尽量不调用实际改动的语句,避免JDK的SecurityManager抱怨。 + */ + public static void makeAccessible(Field field) + { + if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) + || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) + { + field.setAccessible(true); + } + } + + /** + * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处 + * 如无法找到, 返回Object.class. + */ + @SuppressWarnings("unchecked") + public static Class getClassGenricType(final Class clazz) + { + return getClassGenricType(clazz, 0); + } + + /** + * 通过反射, 获得Class定义中声明的父类的泛型参数的类型. + * 如无法找到, 返回Object.class. + */ + public static Class getClassGenricType(final Class clazz, final int index) + { + Type genType = clazz.getGenericSuperclass(); + + if (!(genType instanceof ParameterizedType)) + { + logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); + return Object.class; + } + + Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); + + if (index >= params.length || index < 0) + { + logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " + + params.length); + return Object.class; + } + if (!(params[index] instanceof Class)) + { + logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); + return Object.class; + } + + return (Class) params[index]; + } + + public static Class getUserClass(Object instance) + { + if (instance == null) + { + throw new RuntimeException("Instance must not be null"); + } + Class clazz = instance.getClass(); + if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) + { + Class superClass = clazz.getSuperclass(); + if (superClass != null && !Object.class.equals(superClass)) + { + return superClass; + } + } + return clazz; + + } + + /** + * 将反射时的checked exception转换为unchecked exception. + */ + public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) + { + if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException + || e instanceof NoSuchMethodException) + { + return new IllegalArgumentException(msg, e); + } + else if (e instanceof InvocationTargetException) + { + return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); + } + return new RuntimeException(msg, e); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sign/Base64.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sign/Base64.java new file mode 100644 index 0000000..fd1ccd2 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sign/Base64.java @@ -0,0 +1,291 @@ +package com.zeroerr.common.core.utils.sign; + +/** + * Base64工具类 + * + * @author ruoyi + */ +public final class Base64 +{ + static private final int BASELENGTH = 128; + static private final int LOOKUPLENGTH = 64; + static private final int TWENTYFOURBITGROUP = 24; + static private final int EIGHTBIT = 8; + static private final int SIXTEENBIT = 16; + static private final int FOURBYTE = 4; + static private final int SIGN = -128; + static private final char PAD = '='; + static final private byte[] base64Alphabet = new byte[BASELENGTH]; + static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH]; + + static + { + for (int i = 0; i < BASELENGTH; ++i) + { + base64Alphabet[i] = -1; + } + for (int i = 'Z'; i >= 'A'; i--) + { + base64Alphabet[i] = (byte) (i - 'A'); + } + for (int i = 'z'; i >= 'a'; i--) + { + base64Alphabet[i] = (byte) (i - 'a' + 26); + } + + for (int i = '9'; i >= '0'; i--) + { + base64Alphabet[i] = (byte) (i - '0' + 52); + } + + base64Alphabet['+'] = 62; + base64Alphabet['/'] = 63; + + for (int i = 0; i <= 25; i++) + { + lookUpBase64Alphabet[i] = (char) ('A' + i); + } + + for (int i = 26, j = 0; i <= 51; i++, j++) + { + lookUpBase64Alphabet[i] = (char) ('a' + j); + } + + for (int i = 52, j = 0; i <= 61; i++, j++) + { + lookUpBase64Alphabet[i] = (char) ('0' + j); + } + lookUpBase64Alphabet[62] = (char) '+'; + lookUpBase64Alphabet[63] = (char) '/'; + } + + private static boolean isWhiteSpace(char octect) + { + return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); + } + + private static boolean isPad(char octect) + { + return (octect == PAD); + } + + private static boolean isData(char octect) + { + return (octect < BASELENGTH && base64Alphabet[octect] != -1); + } + + /** + * Encodes hex octects into Base64 + * + * @param binaryData Array containing binaryData + * @return Encoded Base64 array + */ + public static String encode(byte[] binaryData) + { + if (binaryData == null) + { + return null; + } + + int lengthDataBits = binaryData.length * EIGHTBIT; + if (lengthDataBits == 0) + { + return ""; + } + + int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; + int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; + int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; + char encodedData[] = null; + + encodedData = new char[numberQuartet * 4]; + + byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0; + + int encodedIndex = 0; + int dataIndex = 0; + + for (int i = 0; i < numberTriplets; i++) + { + b1 = binaryData[dataIndex++]; + b2 = binaryData[dataIndex++]; + b3 = binaryData[dataIndex++]; + + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc); + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f]; + } + + // form integral number of 6-bit groups + if (fewerThan24bits == EIGHTBIT) + { + b1 = binaryData[dataIndex]; + k = (byte) (b1 & 0x03); + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4]; + encodedData[encodedIndex++] = PAD; + encodedData[encodedIndex++] = PAD; + } + else if (fewerThan24bits == SIXTEENBIT) + { + b1 = binaryData[dataIndex]; + b2 = binaryData[dataIndex + 1]; + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2]; + encodedData[encodedIndex++] = PAD; + } + return new String(encodedData); + } + + /** + * Decodes Base64 data into octects + * + * @param encoded string containing Base64 data + * @return Array containind decoded data. + */ + public static byte[] decode(String encoded) + { + if (encoded == null) + { + return null; + } + + char[] base64Data = encoded.toCharArray(); + // remove white spaces + int len = removeWhiteSpace(base64Data); + + if (len % FOURBYTE != 0) + { + return null;// should be divisible by four + } + + int numberQuadruple = (len / FOURBYTE); + + if (numberQuadruple == 0) + { + return new byte[0]; + } + + byte decodedData[] = null; + byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; + char d1 = 0, d2 = 0, d3 = 0, d4 = 0; + + int i = 0; + int encodedIndex = 0; + int dataIndex = 0; + decodedData = new byte[(numberQuadruple) * 3]; + + for (; i < numberQuadruple - 1; i++) + { + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) + || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) + { + return null; + } // if found "no data" just return null + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + } + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) + { + return null;// if found "no data" just return null + } + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + + d3 = base64Data[dataIndex++]; + d4 = base64Data[dataIndex++]; + if (!isData((d3)) || !isData((d4))) + {// Check if they are PAD characters + if (isPad(d3) && isPad(d4)) + { + if ((b2 & 0xf) != 0)// last 4 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 1]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4); + return tmp; + } + else if (!isPad(d3) && isPad(d4)) + { + b3 = base64Alphabet[d3]; + if ((b3 & 0x3) != 0)// last 2 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 2]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + return tmp; + } + else + { + return null; + } + } + else + { // No PAD e.g 3cQl + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + + } + return decodedData; + } + + /** + * remove WhiteSpace from MIME containing encoded Base64 data. + * + * @param data the byte array of base64 data (with WS) + * @return the new length + */ + private static int removeWhiteSpace(char[] data) + { + if (data == null) + { + return 0; + } + + // count characters that's not whitespace + int newSize = 0; + int len = data.length; + for (int i = 0; i < len; i++) + { + if (!isWhiteSpace(data[i])) + { + data[newSize++] = data[i]; + } + } + return newSize; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sql/SqlUtil.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sql/SqlUtil.java new file mode 100644 index 0000000..a58686b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/sql/SqlUtil.java @@ -0,0 +1,70 @@ +package com.zeroerr.common.core.utils.sql; + +import com.zeroerr.common.core.exception.UtilException; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * sql操作工具类 + * + * @author ruoyi + */ +public class SqlUtil +{ + /** + * 定义常用的 sql关键字 + */ + public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()"; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点(支持多个字段排序) + */ + public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 限制orderBy最大长度 + */ + private static final int ORDER_BY_MAX_LENGTH = 500; + + /** + * 检查字符,防止注入绕过 + */ + public static String escapeOrderBySql(String value) + { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) + { + throw new UtilException("参数不符合规范,不能进行查询"); + } + if (StringUtils.length(value) > ORDER_BY_MAX_LENGTH) + { + throw new UtilException("参数已超过最大限制,不能进行查询"); + } + return value; + } + + /** + * 验证 order by 语法是否符合规范 + */ + public static boolean isValidOrderBySql(String value) + { + return value.matches(SQL_PATTERN); + } + + /** + * SQL关键字检查 + */ + public static void filterKeyword(String value) + { + if (StringUtils.isEmpty(value)) + { + return; + } + String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); + for (String sqlKeyword : sqlKeywords) + { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) + { + throw new UtilException("参数存在SQL注入风险"); + } + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/IdUtils.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/IdUtils.java new file mode 100644 index 0000000..59dd145 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/IdUtils.java @@ -0,0 +1,49 @@ +package com.zeroerr.common.core.utils.uuid; + +/** + * ID生成器工具类 + * + * @author ruoyi + */ +public class IdUtils +{ + /** + * 获取随机UUID + * + * @return 随机UUID + */ + public static String randomUUID() + { + return UUID.randomUUID().toString(); + } + + /** + * 简化的UUID,去掉了横线 + * + * @return 简化的UUID,去掉了横线 + */ + public static String simpleUUID() + { + return UUID.randomUUID().toString(true); + } + + /** + * 获取随机UUID,使用性能更好的ThreadLocalRandom生成UUID + * + * @return 随机UUID + */ + public static String fastUUID() + { + return UUID.fastUUID().toString(); + } + + /** + * 简化的UUID,去掉了横线,使用性能更好的ThreadLocalRandom生成UUID + * + * @return 简化的UUID,去掉了横线 + */ + public static String fastSimpleUUID() + { + return UUID.fastUUID().toString(true); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/Seq.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/Seq.java new file mode 100644 index 0000000..1bce5da --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/Seq.java @@ -0,0 +1,86 @@ +package com.zeroerr.common.core.utils.uuid; + +import java.util.concurrent.atomic.AtomicInteger; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * @author ruoyi 序列生成类 + */ +public class Seq +{ + // 通用序列类型 + public static final String commSeqType = "COMMON"; + + // 上传序列类型 + public static final String uploadSeqType = "UPLOAD"; + + // 通用接口序列数 + private static AtomicInteger commSeq = new AtomicInteger(1); + + // 上传接口序列数 + private static AtomicInteger uploadSeq = new AtomicInteger(1); + + // 机器标识 + private static final String machineCode = "A"; + + /** + * 获取通用序列号 + * + * @return 序列值 + */ + public static String getId() + { + return getId(commSeqType); + } + + /** + * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串 + * + * @return 序列值 + */ + public static String getId(String type) + { + AtomicInteger atomicInt = commSeq; + if (uploadSeqType.equals(type)) + { + atomicInt = uploadSeq; + } + return getId(atomicInt, 3); + } + + /** + * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串 + * + * @param atomicInt 序列数 + * @param length 数值长度 + * @return 序列值 + */ + public static String getId(AtomicInteger atomicInt, int length) + { + String result = DateUtils.dateTimeNow(); + result += machineCode; + result += getSeq(atomicInt, length); + return result; + } + + /** + * 序列循环递增字符串[1, 10 的 (length)幂次方), 用0左补齐length位数 + * + * @return 序列值 + */ + private synchronized static String getSeq(AtomicInteger atomicInt, int length) + { + // 先取值再+1 + int value = atomicInt.getAndIncrement(); + + // 如果更新后值>=10 的 (length)幂次方则重置为1 + int maxSeq = (int) Math.pow(10, length); + if (atomicInt.get() >= maxSeq) + { + atomicInt.set(1); + } + // 转字符串,用0左补齐 + return StringUtils.padl(value, length); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/UUID.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/UUID.java new file mode 100644 index 0000000..73ab480 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/utils/uuid/UUID.java @@ -0,0 +1,484 @@ +package com.zeroerr.common.core.utils.uuid; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; +import com.zeroerr.common.core.exception.UtilException; + +/** + * 提供通用唯一识别码(universally unique identifier)(UUID)实现 + * + * @author ruoyi + */ +public final class UUID implements java.io.Serializable, Comparable +{ + private static final long serialVersionUID = -1185015143654744140L; + + /** + * SecureRandom 的单例 + * + */ + private static class Holder + { + static final SecureRandom numberGenerator = getSecureRandom(); + } + + /** 此UUID的最高64有效位 */ + private final long mostSigBits; + + /** 此UUID的最低64有效位 */ + private final long leastSigBits; + + /** + * 私有构造 + * + * @param data 数据 + */ + private UUID(byte[] data) + { + long msb = 0; + long lsb = 0; + assert data.length == 16 : "data must be 16 bytes in length"; + for (int i = 0; i < 8; i++) + { + msb = (msb << 8) | (data[i] & 0xff); + } + for (int i = 8; i < 16; i++) + { + lsb = (lsb << 8) | (data[i] & 0xff); + } + this.mostSigBits = msb; + this.leastSigBits = lsb; + } + + /** + * 使用指定的数据构造新的 UUID。 + * + * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位 + * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位 + */ + public UUID(long mostSigBits, long leastSigBits) + { + this.mostSigBits = mostSigBits; + this.leastSigBits = leastSigBits; + } + + /** + * 获取类型 4(伪随机生成的)UUID 的静态工厂。 + * + * @return 随机生成的 {@code UUID} + */ + public static UUID fastUUID() + { + return randomUUID(false); + } + + /** + * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 + * + * @return 随机生成的 {@code UUID} + */ + public static UUID randomUUID() + { + return randomUUID(true); + } + + /** + * 获取类型 4(伪随机生成的)UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 + * + * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码,否则可以得到更好的性能 + * @return 随机生成的 {@code UUID} + */ + public static UUID randomUUID(boolean isSecure) + { + final Random ng = isSecure ? Holder.numberGenerator : getRandom(); + + byte[] randomBytes = new byte[16]; + ng.nextBytes(randomBytes); + randomBytes[6] &= 0x0f; /* clear version */ + randomBytes[6] |= 0x40; /* set to version 4 */ + randomBytes[8] &= 0x3f; /* clear variant */ + randomBytes[8] |= 0x80; /* set to IETF variant */ + return new UUID(randomBytes); + } + + /** + * 根据指定的字节数组获取类型 3(基于名称的)UUID 的静态工厂。 + * + * @param name 用于构造 UUID 的字节数组。 + * + * @return 根据指定数组生成的 {@code UUID} + */ + public static UUID nameUUIDFromBytes(byte[] name) + { + MessageDigest md; + try + { + md = MessageDigest.getInstance("MD5"); + } + catch (NoSuchAlgorithmException nsae) + { + throw new InternalError("MD5 not supported"); + } + byte[] md5Bytes = md.digest(name); + md5Bytes[6] &= 0x0f; /* clear version */ + md5Bytes[6] |= 0x30; /* set to version 3 */ + md5Bytes[8] &= 0x3f; /* clear variant */ + md5Bytes[8] |= 0x80; /* set to IETF variant */ + return new UUID(md5Bytes); + } + + /** + * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。 + * + * @param name 指定 {@code UUID} 字符串 + * @return 具有指定值的 {@code UUID} + * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常 + * + */ + public static UUID fromString(String name) + { + String[] components = name.split("-"); + if (components.length != 5) + { + throw new IllegalArgumentException("Invalid UUID string: " + name); + } + for (int i = 0; i < 5; i++) + { + components[i] = "0x" + components[i]; + } + + long mostSigBits = Long.decode(components[0]).longValue(); + mostSigBits <<= 16; + mostSigBits |= Long.decode(components[1]).longValue(); + mostSigBits <<= 16; + mostSigBits |= Long.decode(components[2]).longValue(); + + long leastSigBits = Long.decode(components[3]).longValue(); + leastSigBits <<= 48; + leastSigBits |= Long.decode(components[4]).longValue(); + + return new UUID(mostSigBits, leastSigBits); + } + + /** + * 返回此 UUID 的 128 位值中的最低有效 64 位。 + * + * @return 此 UUID 的 128 位值中的最低有效 64 位。 + */ + public long getLeastSignificantBits() + { + return leastSigBits; + } + + /** + * 返回此 UUID 的 128 位值中的最高有效 64 位。 + * + * @return 此 UUID 的 128 位值中最高有效 64 位。 + */ + public long getMostSignificantBits() + { + return mostSigBits; + } + + /** + * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。 + *

+ * 版本号具有以下含意: + *

    + *
  • 1 基于时间的 UUID + *
  • 2 DCE 安全 UUID + *
  • 3 基于名称的 UUID + *
  • 4 随机生成的 UUID + *
+ * + * @return 此 {@code UUID} 的版本号 + */ + public int version() + { + // Version is bits masked by 0x000000000000F000 in MS long + return (int) ((mostSigBits >> 12) & 0x0f); + } + + /** + * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。 + *

+ * 变体号具有以下含意: + *

    + *
  • 0 为 NCS 向后兼容保留 + *
  • 2 IETF RFC 4122(Leach-Salz), 用于此类 + *
  • 6 保留,微软向后兼容 + *
  • 7 保留供以后定义使用 + *
+ * + * @return 此 {@code UUID} 相关联的变体号 + */ + public int variant() + { + // This field is composed of a varying number of bits. + // 0 - - Reserved for NCS backward compatibility + // 1 0 - The IETF aka Leach-Salz variant (used by this class) + // 1 1 0 Reserved, Microsoft backward compatibility + // 1 1 1 Reserved for future definition. + return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63)); + } + + /** + * 与此 UUID 相关联的时间戳值。 + * + *

+ * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。
+ * 所得到的时间戳以 100 毫微秒为单位,从 UTC(通用协调时间) 1582 年 10 月 15 日零时开始。 + * + *

+ * 时间戳值仅在在基于时间的 UUID(其 version 类型为 1)中才有意义。
+ * 如果此 {@code UUID} 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。 + * + * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。 + */ + public long timestamp() throws UnsupportedOperationException + { + checkTimeBase(); + return (mostSigBits & 0x0FFFL) << 48// + | ((mostSigBits >> 16) & 0x0FFFFL) << 32// + | mostSigBits >>> 32; + } + + /** + * 与此 UUID 相关联的时钟序列值。 + * + *

+ * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。 + *

+ * {@code clockSequence} 值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。 如果此 UUID 不是基于时间的 UUID,则此方法抛出 + * UnsupportedOperationException。 + * + * @return 此 {@code UUID} 的时钟序列 + * + * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 + */ + public int clockSequence() throws UnsupportedOperationException + { + checkTimeBase(); + return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); + } + + /** + * 与此 UUID 相关的节点值。 + * + *

+ * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址,该地址用于生成此 UUID 以保证空间唯一性。 + *

+ * 节点值仅在基于时间的 UUID(其 version 类型为 1)中才有意义。
+ * 如果此 UUID 不是基于时间的 UUID,则此方法抛出 UnsupportedOperationException。 + * + * @return 此 {@code UUID} 的节点值 + * + * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 + */ + public long node() throws UnsupportedOperationException + { + checkTimeBase(); + return leastSigBits & 0x0000FFFFFFFFFFFFL; + } + + /** + * 返回此{@code UUID} 的字符串表现形式。 + * + *

+ * UUID 的字符串表示形式由此 BNF 描述: + * + *

+     * {@code
+     * UUID                   = ----
+     * time_low               = 4*
+     * time_mid               = 2*
+     * time_high_and_version  = 2*
+     * variant_and_sequence   = 2*
+     * node                   = 6*
+     * hexOctet               = 
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * 
+ * + * + * + * @return 此{@code UUID} 的字符串表现形式 + * @see #toString(boolean) + */ + @Override + public String toString() + { + return toString(false); + } + + /** + * 返回此{@code UUID} 的字符串表现形式。 + * + *

+ * UUID 的字符串表示形式由此 BNF 描述: + * + *

+     * {@code
+     * UUID                   = ----
+     * time_low               = 4*
+     * time_mid               = 2*
+     * time_high_and_version  = 2*
+     * variant_and_sequence   = 2*
+     * node                   = 6*
+     * hexOctet               = 
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * 
+ * + * + * + * @param isSimple 是否简单模式,简单模式为不带'-'的UUID字符串 + * @return 此{@code UUID} 的字符串表现形式 + */ + public String toString(boolean isSimple) + { + final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36); + // time_low + builder.append(digits(mostSigBits >> 32, 8)); + if (false == isSimple) + { + builder.append('-'); + } + // time_mid + builder.append(digits(mostSigBits >> 16, 4)); + if (false == isSimple) + { + builder.append('-'); + } + // time_high_and_version + builder.append(digits(mostSigBits, 4)); + if (false == isSimple) + { + builder.append('-'); + } + // variant_and_sequence + builder.append(digits(leastSigBits >> 48, 4)); + if (false == isSimple) + { + builder.append('-'); + } + // node + builder.append(digits(leastSigBits, 12)); + + return builder.toString(); + } + + /** + * 返回此 UUID 的哈希码。 + * + * @return UUID 的哈希码值。 + */ + @Override + public int hashCode() + { + long hilo = mostSigBits ^ leastSigBits; + return ((int) (hilo >> 32)) ^ (int) hilo; + } + + /** + * 将此对象与指定对象比较。 + *

+ * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值(每一位均相同)时,结果才为 {@code true}。 + * + * @param obj 要与之比较的对象 + * + * @return 如果对象相同,则返回 {@code true};否则返回 {@code false} + */ + @Override + public boolean equals(Object obj) + { + if ((null == obj) || (obj.getClass() != UUID.class)) + { + return false; + } + UUID id = (UUID) obj; + return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits); + } + + // Comparison Operations + + /** + * 将此 UUID 与指定的 UUID 比较。 + * + *

+ * 如果两个 UUID 不同,且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段,则第一个 UUID 大于第二个 UUID。 + * + * @param val 与此 UUID 比较的 UUID + * + * @return 在此 UUID 小于、等于或大于 val 时,分别返回 -1、0 或 1。 + * + */ + @Override + public int compareTo(UUID val) + { + // The ordering is intentionally set up so that the UUIDs + // can simply be numerically compared as two numbers + return (this.mostSigBits < val.mostSigBits ? -1 : // + (this.mostSigBits > val.mostSigBits ? 1 : // + (this.leastSigBits < val.leastSigBits ? -1 : // + (this.leastSigBits > val.leastSigBits ? 1 : // + 0)))); + } + + // ------------------------------------------------------------------------------------------------------------------- + // Private method start + /** + * 返回指定数字对应的hex值 + * + * @param val 值 + * @param digits 位 + * @return 值 + */ + private static String digits(long val, int digits) + { + long hi = 1L << (digits * 4); + return Long.toHexString(hi | (val & (hi - 1))).substring(1); + } + + /** + * 检查是否为time-based版本UUID + */ + private void checkTimeBase() + { + if (version() != 1) + { + throw new UnsupportedOperationException("Not a time-based UUID"); + } + } + + /** + * 获取{@link SecureRandom},类提供加密的强随机数生成器 (RNG) + * + * @return {@link SecureRandom} + */ + public static SecureRandom getSecureRandom() + { + try + { + return SecureRandom.getInstance("SHA1PRNG"); + } + catch (NoSuchAlgorithmException e) + { + throw new UtilException(e); + } + } + + /** + * 获取随机数生成器对象
+ * ThreadLocalRandom是JDK 7之后提供并发产生随机数,能够解决多个线程发生的竞争争夺。 + * + * @return {@link ThreadLocalRandom} + */ + public static ThreadLocalRandom getRandom() + { + return ThreadLocalRandom.current(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/controller/BaseController.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/controller/BaseController.java new file mode 100644 index 0000000..d4258f5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/controller/BaseController.java @@ -0,0 +1,142 @@ +package com.zeroerr.common.core.web.controller; + +import java.beans.PropertyEditorSupport; +import java.util.Date; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import com.github.pagehelper.PageInfo; +import com.zeroerr.common.core.constant.HttpStatus; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.PageUtils; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; + +/** + * web层通用数据处理 + * + * @author ruoyi + */ +public class BaseController +{ + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + + /** + * 将前台传递过来的日期格式的字符串,自动转化为Date类型 + */ + @InitBinder + public void initBinder(WebDataBinder binder) + { + // Date 类型转换 + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() + { + @Override + public void setAsText(String text) + { + setValue(DateUtils.parseDate(text)); + } + }); + } + + /** + * 设置请求分页数据 + */ + protected void startPage() + { + PageUtils.startPage(); + } + + /** + * 清理分页的线程变量 + */ + protected void clearPage() + { + PageUtils.clearPage(); + } + + /** + * 响应请求分页数据 + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected TableDataInfo getDataTable(List list) + { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setRows(list); + rspData.setMsg("查询成功"); + rspData.setTotal(new PageInfo(list).getTotal()); + return rspData; + } + + /** + * 返回成功 + */ + public AjaxResult success() + { + return AjaxResult.success(); + } + + /** + * 返回成功消息 + */ + public AjaxResult success(String message) + { + return AjaxResult.success(message); + } + + /** + * 返回成功消息 + */ + public AjaxResult success(Object data) + { + return AjaxResult.success(data); + } + + /** + * 返回失败消息 + */ + public AjaxResult error() + { + return AjaxResult.error(); + } + + /** + * 返回失败消息 + */ + public AjaxResult error(String message) + { + return AjaxResult.error(message); + } + + /** + * 返回警告消息 + */ + public AjaxResult warn(String message) + { + return AjaxResult.warn(message); + } + + /** + * 响应返回结果 + * + * @param rows 影响行数 + * @return 操作结果 + */ + protected AjaxResult toAjax(int rows) + { + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } + + /** + * 响应返回结果 + * + * @param result 结果 + * @return 操作结果 + */ + protected AjaxResult toAjax(boolean result) + { + return result ? success() : error(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/AjaxResult.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/AjaxResult.java new file mode 100644 index 0000000..da4b705 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/AjaxResult.java @@ -0,0 +1,216 @@ +package com.zeroerr.common.core.web.domain; + +import java.util.HashMap; +import java.util.Objects; +import com.zeroerr.common.core.constant.HttpStatus; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 操作消息提醒 + * + * @author ruoyi + */ +public class AjaxResult extends HashMap +{ + private static final long serialVersionUID = 1L; + + /** 状态码 */ + public static final String CODE_TAG = "code"; + + /** 返回内容 */ + public static final String MSG_TAG = "msg"; + + /** 数据对象 */ + public static final String DATA_TAG = "data"; + + /** + * 初始化一个新创建的 AjaxResult 对象,使其表示一个空消息。 + */ + public AjaxResult() + { + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param code 状态码 + * @param msg 返回内容 + */ + public AjaxResult(int code, String msg) + { + super.put(CODE_TAG, code); + super.put(MSG_TAG, msg); + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param code 状态码 + * @param msg 返回内容 + * @param data 数据对象 + */ + public AjaxResult(int code, String msg, Object data) + { + super.put(CODE_TAG, code); + super.put(MSG_TAG, msg); + if (StringUtils.isNotNull(data)) + { + super.put(DATA_TAG, data); + } + } + + /** + * 返回成功消息 + * + * @return 成功消息 + */ + public static AjaxResult success() + { + return AjaxResult.success("操作成功"); + } + + /** + * 返回成功数据 + * + * @return 成功消息 + */ + public static AjaxResult success(Object data) + { + return AjaxResult.success("操作成功", data); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @return 成功消息 + */ + public static AjaxResult success(String msg) + { + return AjaxResult.success(msg, null); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 成功消息 + */ + public static AjaxResult success(String msg, Object data) + { + return new AjaxResult(HttpStatus.SUCCESS, msg, data); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult warn(String msg) + { + return AjaxResult.warn(msg, null); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static AjaxResult warn(String msg, Object data) + { + return new AjaxResult(HttpStatus.WARN, msg, data); + } + + /** + * 返回错误消息 + * + * @return 错误消息 + */ + public static AjaxResult error() + { + return AjaxResult.error("操作失败"); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @return 错误消息 + */ + public static AjaxResult error(String msg) + { + return AjaxResult.error(msg, null); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 错误消息 + */ + public static AjaxResult error(String msg, Object data) + { + return new AjaxResult(HttpStatus.ERROR, msg, data); + } + + /** + * 返回错误消息 + * + * @param code 状态码 + * @param msg 返回内容 + * @return 错误消息 + */ + public static AjaxResult error(int code, String msg) + { + return new AjaxResult(code, msg, null); + } + + /** + * 是否为成功消息 + * + * @return 结果 + */ + public boolean isSuccess() + { + return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG)); + } + + /** + * 是否为警告消息 + * + * @return 结果 + */ + public boolean isWarn() + { + return Objects.equals(HttpStatus.WARN, this.get(CODE_TAG)); + } + + /** + * 是否为错误消息 + * + * @return 结果 + */ + public boolean isError() + { + return Objects.equals(HttpStatus.ERROR, this.get(CODE_TAG)); + } + + /** + * 方便链式调用 + * + * @param key + * @param value + * @return + */ + @Override + public AjaxResult put(String key, Object value) + { + super.put(key, value); + return this; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/BaseEntity.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/BaseEntity.java new file mode 100644 index 0000000..c72766b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/BaseEntity.java @@ -0,0 +1,118 @@ +package com.zeroerr.common.core.web.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +/** + * Entity基类 + * + * @author ruoyi + */ +public class BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 搜索值 */ + @JsonIgnore + private String searchValue; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 备注 */ + private String remark; + + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map params; + + public String getSearchValue() + { + return searchValue; + } + + public void setSearchValue(String searchValue) + { + this.searchValue = searchValue; + } + + public String getCreateBy() + { + return createBy; + } + + public void setCreateBy(String createBy) + { + this.createBy = createBy; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public String getUpdateBy() + { + return updateBy; + } + + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public String getRemark() + { + return remark; + } + + public void setRemark(String remark) + { + this.remark = remark; + } + + public Map getParams() + { + if (params == null) + { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) + { + this.params = params; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/TreeEntity.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/TreeEntity.java new file mode 100644 index 0000000..cdc9dec --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/domain/TreeEntity.java @@ -0,0 +1,79 @@ +package com.zeroerr.common.core.web.domain; + +import java.util.ArrayList; +import java.util.List; + +/** + * Tree基类 + * + * @author ruoyi + */ +public class TreeEntity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 祖级列表 */ + private String ancestors; + + /** 子部门 */ + private List children = new ArrayList<>(); + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/PageDomain.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/PageDomain.java new file mode 100644 index 0000000..295507e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/PageDomain.java @@ -0,0 +1,101 @@ +package com.zeroerr.common.core.web.page; + +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 分页数据 + * + * @author ruoyi + */ +public class PageDomain +{ + /** 当前记录起始索引 */ + private Integer pageNum; + + /** 每页显示记录数 */ + private Integer pageSize; + + /** 排序列 */ + private String orderByColumn; + + /** 排序的方向desc或者asc */ + private String isAsc = "asc"; + + /** 分页参数合理化 */ + private Boolean reasonable = true; + + public String getOrderBy() + { + if (StringUtils.isEmpty(orderByColumn)) + { + return ""; + } + return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; + } + + public Integer getPageNum() + { + return pageNum; + } + + public void setPageNum(Integer pageNum) + { + this.pageNum = pageNum; + } + + public Integer getPageSize() + { + return pageSize; + } + + public void setPageSize(Integer pageSize) + { + this.pageSize = pageSize; + } + + public String getOrderByColumn() + { + return orderByColumn; + } + + public void setOrderByColumn(String orderByColumn) + { + this.orderByColumn = orderByColumn; + } + + public String getIsAsc() + { + return isAsc; + } + + public void setIsAsc(String isAsc) + { + if (StringUtils.isNotEmpty(isAsc)) + { + // 兼容前端排序类型 + if ("ascending".equals(isAsc)) + { + isAsc = "asc"; + } + else if ("descending".equals(isAsc)) + { + isAsc = "desc"; + } + this.isAsc = isAsc; + } + } + + public Boolean getReasonable() + { + if (StringUtils.isNull(reasonable)) + { + return Boolean.TRUE; + } + return reasonable; + } + + public void setReasonable(Boolean reasonable) + { + this.reasonable = reasonable; + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableDataInfo.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableDataInfo.java new file mode 100644 index 0000000..0fb7097 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableDataInfo.java @@ -0,0 +1,85 @@ +package com.zeroerr.common.core.web.page; + +import java.io.Serializable; +import java.util.List; + +/** + * 表格分页数据对象 + * + * @author ruoyi + */ +public class TableDataInfo implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 总记录数 */ + private long total; + + /** 列表数据 */ + private List rows; + + /** 消息状态码 */ + private int code; + + /** 消息内容 */ + private String msg; + + /** + * 表格数据对象 + */ + public TableDataInfo() + { + } + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public TableDataInfo(List list, int total) + { + this.rows = list; + this.total = total; + } + + public long getTotal() + { + return total; + } + + public void setTotal(long total) + { + this.total = total; + } + + public List getRows() + { + return rows; + } + + public void setRows(List rows) + { + this.rows = rows; + } + + public int getCode() + { + return code; + } + + public void setCode(int code) + { + this.code = code; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableSupport.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableSupport.java new file mode 100644 index 0000000..481c67f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/web/page/TableSupport.java @@ -0,0 +1,56 @@ +package com.zeroerr.common.core.web.page; + +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.ServletUtils; + +/** + * 表格数据处理 + * + * @author ruoyi + */ +public class TableSupport +{ + /** + * 当前记录起始索引 + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页显示记录数 + */ + public static final String PAGE_SIZE = "pageSize"; + + /** + * 排序列 + */ + public static final String ORDER_BY_COLUMN = "orderByColumn"; + + /** + * 排序的方向 "desc" 或者 "asc". + */ + public static final String IS_ASC = "isAsc"; + + /** + * 分页参数合理化 + */ + public static final String REASONABLE = "reasonable"; + + /** + * 封装分页对象 + */ + public static PageDomain getPageDomain() + { + PageDomain pageDomain = new PageDomain(); + pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); + pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); + pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); + pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); + pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); + return pageDomain; + } + + public static PageDomain buildPageRequest() + { + return getPageDomain(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/Xss.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/Xss.java new file mode 100644 index 0000000..cc6c96c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/Xss.java @@ -0,0 +1,27 @@ +package com.zeroerr.common.core.xss; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义xss校验注解 + * + * @author ruoyi + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) +@Constraint(validatedBy = { XssValidator.class }) +public @interface Xss +{ + String message() + + default "不允许任何脚本运行"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/XssValidator.java b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/XssValidator.java new file mode 100644 index 0000000..902a3b5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/java/com/zeroerr/common/core/xss/XssValidator.java @@ -0,0 +1,39 @@ +package com.zeroerr.common.core.xss; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 自定义xss校验注解实现 + * + * @author ruoyi + */ +public class XssValidator implements ConstraintValidator +{ + private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />"; + + @Override + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) + { + if (StringUtils.isBlank(value)) + { + return true; + } + return !containsHtml(value); + } + + public static boolean containsHtml(String value) + { + StringBuilder sHtml = new StringBuilder(); + Pattern pattern = Pattern.compile(HTML_PATTERN); + Matcher matcher = pattern.matcher(value); + while (matcher.find()) + { + sHtml.append(matcher.group()); + } + return pattern.matcher(sHtml).matches(); + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..a2e8b32 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.zeroerr.common.core.utils.SpringUtils +com.zeroerr.common.core.config.MybatisPlusConfig + diff --git a/zeroerroa-common/zeroerroa-common-datascope/pom.xml b/zeroerroa-common/zeroerroa-common-datascope/pom.xml new file mode 100644 index 0000000..d3cae1e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datascope/pom.xml @@ -0,0 +1,27 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-datascope + + + zeroerroa-common-datascope权限范围 + + + + + + + com.zeroerr + zeroerroa-common-security + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/annotation/DataScope.java b/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/annotation/DataScope.java new file mode 100644 index 0000000..eec81e7 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/annotation/DataScope.java @@ -0,0 +1,33 @@ +package com.zeroerr.common.datascope.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 数据权限过滤注解 + * + * @author ruoyi + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataScope +{ + /** + * 部门表的别名 + */ + public String deptAlias() default ""; + + /** + * 用户表的别名 + */ + public String userAlias() default ""; + + /** + * 权限字符(用于多个角色匹配符合要求的权限)默认根据权限注解@RequiresPermissions获取,多个权限用逗号分隔开来 + */ + public String permission() default ""; +} diff --git a/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/aspect/DataScopeAspect.java b/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/aspect/DataScopeAspect.java new file mode 100644 index 0000000..90c9e0c --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datascope/src/main/java/com/zeroerr/common/datascope/aspect/DataScopeAspect.java @@ -0,0 +1,184 @@ +package com.zeroerr.common.datascope.aspect; + +import java.util.ArrayList; +import java.util.List; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.context.SecurityContextHolder; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.domain.BaseEntity; +import com.zeroerr.common.datascope.annotation.DataScope; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 数据过滤处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class DataScopeAspect +{ + /** + * 全部数据权限 + */ + public static final String DATA_SCOPE_ALL = "1"; + + /** + * 自定数据权限 + */ + public static final String DATA_SCOPE_CUSTOM = "2"; + + /** + * 部门数据权限 + */ + public static final String DATA_SCOPE_DEPT = "3"; + + /** + * 部门及以下数据权限 + */ + public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; + + /** + * 仅本人数据权限 + */ + public static final String DATA_SCOPE_SELF = "5"; + + /** + * 数据权限过滤关键字 + */ + public static final String DATA_SCOPE = "dataScope"; + + @Before("@annotation(controllerDataScope)") + public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable + { + clearDataScope(point); + handleDataScope(point, controllerDataScope); + } + + protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) + { + // 获取当前的用户 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNotNull(loginUser)) + { + SysUser currentUser = loginUser.getSysUser(); + // 如果是超级管理员,则不过滤数据 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) + { + String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission()); + dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), + controllerDataScope.userAlias(), permission); + } + } + } + + /** + * 数据范围过滤 + * + * @param joinPoint 切点 + * @param user 用户 + * @param deptAlias 部门别名 + * @param userAlias 用户别名 + * @param permission 权限字符 + */ + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) + { + StringBuilder sqlString = new StringBuilder(); + List conditions = new ArrayList(); + List scopeCustomIds = new ArrayList(); + user.getRoles().forEach(role -> { + if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + { + scopeCustomIds.add(Convert.toStr(role.getRoleId())); + } + }); + + for (SysRole role : user.getRoles()) + { + String dataScope = role.getDataScope(); + if (conditions.contains(dataScope)) + { + continue; + } + if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + { + continue; + } + if (DATA_SCOPE_ALL.equals(dataScope)) + { + sqlString = new StringBuilder(); + conditions.add(dataScope); + break; + } + else if (DATA_SCOPE_CUSTOM.equals(dataScope)) + { + if (scopeCustomIds.size() > 1) + { + // 多个自定数据权限使用in查询,避免多次拼接。 + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds))); + } + else + { + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); + } + } + else if (DATA_SCOPE_DEPT.equals(dataScope)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); + } + else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId())); + } + else if (DATA_SCOPE_SELF.equals(dataScope)) + { + if (StringUtils.isNotBlank(userAlias)) + { + sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); + } + else + { + // 数据权限为仅本人且没有userAlias别名不查询任何数据 + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + } + conditions.add(dataScope); + } + + // 角色都不包含传递过来的权限字符,这个时候sqlString也会为空,所以要限制一下,不查询任何数据 + if (StringUtils.isEmpty(conditions)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + + if (StringUtils.isNotBlank(sqlString.toString())) + { + Object params = joinPoint.getArgs()[0]; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) + { + BaseEntity baseEntity = (BaseEntity) params; + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); + } + } + } + + /** + * 拼接权限sql前先清空params.dataScope参数防止注入 + */ + private void clearDataScope(final JoinPoint joinPoint) + { + Object params = joinPoint.getArgs()[0]; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) + { + BaseEntity baseEntity = (BaseEntity) params; + baseEntity.getParams().put(DATA_SCOPE, ""); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e9c4fcf --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.zeroerr.common.datascope.aspect.DataScopeAspect diff --git a/zeroerroa-common/zeroerroa-common-datasource/pom.xml b/zeroerroa-common/zeroerroa-common-datasource/pom.xml new file mode 100644 index 0000000..e9abfbf --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datasource/pom.xml @@ -0,0 +1,35 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-datasource + + + zeroerroa-common-datasource多数据源 + + + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Master.java b/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Master.java new file mode 100644 index 0000000..36d9d50 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Master.java @@ -0,0 +1,22 @@ +package com.zeroerr.common.datasource.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.baomidou.dynamic.datasource.annotation.DS; + +/** + * 主库数据源 + * + * @author ruoyi + */ +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@DS("master") +public @interface Master +{ + +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Slave.java b/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Slave.java new file mode 100644 index 0000000..7df5e5e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-datasource/src/main/java/com/zeroerr/common/datasource/annotation/Slave.java @@ -0,0 +1,22 @@ +package com.zeroerr.common.datasource.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.baomidou.dynamic.datasource.annotation.DS; + +/** + * 从库数据源 + * + * @author ruoyi + */ +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@DS("slave") +public @interface Slave +{ + +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-log/pom.xml b/zeroerroa-common/zeroerroa-common-log/pom.xml new file mode 100644 index 0000000..501469f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/pom.xml @@ -0,0 +1,27 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-log + + + zeroerroa-common-log日志记录 + + + + + + + com.zeroerr + zeroerroa-common-security + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/annotation/Log.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/annotation/Log.java new file mode 100644 index 0000000..cba4429 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/annotation/Log.java @@ -0,0 +1,51 @@ +package com.zeroerr.common.log.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.log.enums.OperatorType; + +/** + * 自定义操作日志记录注解 + * + * @author ruoyi + * + */ +@Target({ ElementType.PARAMETER, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Log +{ + /** + * 模块 + */ + public String title() default ""; + + /** + * 功能 + */ + public BusinessType businessType() default BusinessType.OTHER; + + /** + * 操作人类别 + */ + public OperatorType operatorType() default OperatorType.MANAGE; + + /** + * 是否保存请求的参数 + */ + public boolean isSaveRequestData() default true; + + /** + * 是否保存响应的参数 + */ + public boolean isSaveResponseData() default true; + + /** + * 排除指定的请求参数 + */ + public String[] excludeParamNames() default {}; +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/aspect/LogAspect.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/aspect/LogAspect.java new file mode 100644 index 0000000..2aeaeac --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/aspect/LogAspect.java @@ -0,0 +1,249 @@ +package com.zeroerr.common.log.aspect; + +import java.util.Collection; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.NamedThreadLocal; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; +import com.alibaba.fastjson2.JSON; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.ip.IpUtils; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessStatus; +import com.zeroerr.common.log.filter.PropertyPreExcludeFilter; +import com.zeroerr.common.log.service.AsyncLogService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysOperLog; + +/** + * 操作日志记录处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class LogAspect +{ + private static final Logger log = LoggerFactory.getLogger(LogAspect.class); + + /** 排除敏感属性字段 */ + public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; + + /** 计算操作消耗时间 */ + private static final ThreadLocal TIME_THREADLOCAL = new NamedThreadLocal("Cost Time"); + + @Autowired + private AsyncLogService asyncLogService; + + /** + * 处理请求前执行 + */ + @Before(value = "@annotation(controllerLog)") + public void boBefore(JoinPoint joinPoint, Log controllerLog) + { + TIME_THREADLOCAL.set(System.currentTimeMillis()); + } + + /** + * 处理完请求后执行 + * + * @param joinPoint 切点 + */ + @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") + public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) + { + handleLog(joinPoint, controllerLog, null, jsonResult); + } + + /** + * 拦截异常操作 + * + * @param joinPoint 切点 + * @param e 异常 + */ + @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") + public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) + { + handleLog(joinPoint, controllerLog, e, null); + } + + protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) + { + try + { + // *========数据库日志=========*// + SysOperLog operLog = new SysOperLog(); + operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); + // 请求的地址 + String ip = IpUtils.getIpAddr(); + operLog.setOperIp(ip); + operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); + String username = SecurityUtils.getUsername(); + if (StringUtils.isNotBlank(username)) + { + operLog.setOperName(username); + } + + if (e != null) + { + operLog.setStatus(BusinessStatus.FAIL.ordinal()); + operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); + } + // 设置方法名称 + String className = joinPoint.getTarget().getClass().getName(); + String methodName = joinPoint.getSignature().getName(); + operLog.setMethod(className + "." + methodName + "()"); + // 设置请求方式 + operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); + // 处理设置注解上的参数 + getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); + // 设置消耗时间 + operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get()); + // 保存数据库 + asyncLogService.saveSysLog(operLog); + } + catch (Exception exp) + { + // 记录本地异常日志 + log.error("异常信息:{}", exp.getMessage()); + exp.printStackTrace(); + } + finally + { + TIME_THREADLOCAL.remove(); + } + } + + /** + * 获取注解中对方法的描述信息 用于Controller层注解 + * + * @param log 日志 + * @param operLog 操作日志 + * @throws Exception + */ + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception + { + // 设置action动作 + operLog.setBusinessType(log.businessType().ordinal()); + // 设置标题 + operLog.setTitle(log.title()); + // 设置操作人类别 + operLog.setOperatorType(log.operatorType().ordinal()); + // 是否需要保存request,参数和值 + if (log.isSaveRequestData()) + { + // 获取参数的信息,传入到数据库中。 + setRequestValue(joinPoint, operLog, log.excludeParamNames()); + } + // 是否需要保存response,参数和值 + if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) + { + operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000)); + } + } + + /** + * 获取请求的参数,放到log中 + * + * @param operLog 操作日志 + * @throws Exception 异常 + */ + private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception + { + String requestMethod = operLog.getRequestMethod(); + Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); + if (StringUtils.isEmpty(paramsMap) + && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))) + { + String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); + operLog.setOperParam(StringUtils.substring(params, 0, 2000)); + } + else + { + operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000)); + } + } + + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) + { + String params = ""; + if (paramsArray != null && paramsArray.length > 0) + { + for (Object o : paramsArray) + { + if (StringUtils.isNotNull(o) && !isFilterObject(o)) + { + try + { + String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames)); + params += jsonObj.toString() + " "; + } + catch (Exception e) + { + } + } + } + } + return params.trim(); + } + + /** + * 忽略敏感属性 + */ + public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames) + { + return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames)); + } + + /** + * 判断是否需要过滤的对象。 + * + * @param o 对象信息。 + * @return 如果是需要过滤的对象,则返回true;否则返回false。 + */ + @SuppressWarnings("rawtypes") + public boolean isFilterObject(final Object o) + { + Class clazz = o.getClass(); + if (clazz.isArray()) + { + return clazz.getComponentType().isAssignableFrom(MultipartFile.class); + } + else if (Collection.class.isAssignableFrom(clazz)) + { + Collection collection = (Collection) o; + for (Object value : collection) + { + return value instanceof MultipartFile; + } + } + else if (Map.class.isAssignableFrom(clazz)) + { + Map map = (Map) o; + for (Object value : map.entrySet()) + { + Map.Entry entry = (Map.Entry) value; + return entry.getValue() instanceof MultipartFile; + } + } + return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse + || o instanceof BindingResult; + } +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessStatus.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessStatus.java new file mode 100644 index 0000000..1b5f424 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessStatus.java @@ -0,0 +1,20 @@ +package com.zeroerr.common.log.enums; + +/** + * 操作状态 + * + * @author ruoyi + * + */ +public enum BusinessStatus +{ + /** + * 成功 + */ + SUCCESS, + + /** + * 失败 + */ + FAIL, +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessType.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessType.java new file mode 100644 index 0000000..affcb72 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/BusinessType.java @@ -0,0 +1,59 @@ +package com.zeroerr.common.log.enums; + +/** + * 业务操作类型 + * + * @author ruoyi + */ +public enum BusinessType +{ + /** + * 其它 + */ + OTHER, + + /** + * 新增 + */ + INSERT, + + /** + * 修改 + */ + UPDATE, + + /** + * 删除 + */ + DELETE, + + /** + * 授权 + */ + GRANT, + + /** + * 导出 + */ + EXPORT, + + /** + * 导入 + */ + IMPORT, + + /** + * 强退 + */ + FORCE, + + /** + * 生成代码 + */ + GENCODE, + + /** + * 清空数据 + */ + CLEAN, +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/OperatorType.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/OperatorType.java new file mode 100644 index 0000000..52763ca --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/enums/OperatorType.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.log.enums; + +/** + * 操作人类别 + * + * @author ruoyi + */ +public enum OperatorType +{ + /** + * 其它 + */ + OTHER, + + /** + * 后台用户 + */ + MANAGE, + + /** + * 手机端用户 + */ + MOBILE +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/filter/PropertyPreExcludeFilter.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/filter/PropertyPreExcludeFilter.java new file mode 100644 index 0000000..7f5af56 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/filter/PropertyPreExcludeFilter.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.log.filter; + +import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; + +/** + * 排除JSON敏感属性 + * + * @author ruoyi + */ +public class PropertyPreExcludeFilter extends SimplePropertyPreFilter +{ + public PropertyPreExcludeFilter() + { + } + + public PropertyPreExcludeFilter addExcludes(String... filters) + { + for (int i = 0; i < filters.length; i++) + { + this.getExcludes().add(filters[i]); + } + return this; + } +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/service/AsyncLogService.java b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/service/AsyncLogService.java new file mode 100644 index 0000000..3153574 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/java/com/zeroerr/common/log/service/AsyncLogService.java @@ -0,0 +1,29 @@ +package com.zeroerr.common.log.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.system.api.RemoteLogService; +import com.zeroerr.system.api.domain.SysOperLog; + +/** + * 异步调用日志服务 + * + * @author ruoyi + */ +@Service +public class AsyncLogService +{ + @Autowired + private RemoteLogService remoteLogService; + + /** + * 保存系统日志记录 + */ + @Async + public void saveSysLog(SysOperLog sysOperLog) throws Exception + { + remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER); + } +} diff --git a/zeroerroa-common/zeroerroa-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6986d83 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.zeroerr.common.log.service.AsyncLogService +com.zeroerr.common.log.aspect.LogAspect diff --git a/zeroerroa-common/zeroerroa-common-redis/pom.xml b/zeroerroa-common/zeroerroa-common-redis/pom.xml new file mode 100644 index 0000000..ac060aa --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-redis/pom.xml @@ -0,0 +1,33 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-redis + + + zeroerroa-common-redis缓存服务 + + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + com.zeroerr + zeroerroa-common-core + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/FastJson2JsonRedisSerializer.java b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/FastJson2JsonRedisSerializer.java new file mode 100644 index 0000000..365af05 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -0,0 +1,52 @@ +package com.zeroerr.common.redis.configure; + +import java.nio.charset.Charset; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONReader; +import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson2.filter.Filter; +import com.zeroerr.common.core.constant.Constants; + +/** + * Redis使用FastJson序列化 + * + * @author ruoyi + */ +public class FastJson2JsonRedisSerializer implements RedisSerializer +{ + public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); + + static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR); + + private Class clazz; + + public FastJson2JsonRedisSerializer(Class clazz) + { + super(); + this.clazz = clazz; + } + + @Override + public byte[] serialize(T t) throws SerializationException + { + if (t == null) + { + return new byte[0]; + } + return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET); + } + + @Override + public T deserialize(byte[] bytes) throws SerializationException + { + if (bytes == null || bytes.length <= 0) + { + return null; + } + String str = new String(bytes, DEFAULT_CHARSET); + + return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER); + } +} diff --git a/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/RedisConfig.java b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/RedisConfig.java new file mode 100644 index 0000000..3d4bbb5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/configure/RedisConfig.java @@ -0,0 +1,43 @@ +package com.zeroerr.common.redis.configure; + +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * redis配置 + * + * @author ruoyi + */ +@Configuration +@EnableCaching +@AutoConfigureBefore(RedisAutoConfiguration.class) +public class RedisConfig extends CachingConfigurerSupport +{ + @Bean + @SuppressWarnings(value = { "unchecked", "rawtypes" }) + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) + { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(connectionFactory); + + FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(serializer); + + // Hash的key也采用StringRedisSerializer的序列化方式 + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(serializer); + + template.afterPropertiesSet(); + return template; + } +} diff --git a/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/service/RedisService.java b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/service/RedisService.java new file mode 100644 index 0000000..8f067db --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-redis/src/main/java/com/zeroerr/common/redis/service/RedisService.java @@ -0,0 +1,268 @@ +package com.zeroerr.common.redis.service; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.BoundSetOperations; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; + +/** + * spring redis 工具类 + * + * @author ruoyi + **/ +@SuppressWarnings(value = { "unchecked", "rawtypes" }) +@Component +public class RedisService +{ + @Autowired + public RedisTemplate redisTemplate; + + /** + * 缓存基本的对象,Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + */ + public void setCacheObject(final String key, final T value) + { + redisTemplate.opsForValue().set(key, value); + } + + /** + * 缓存基本的对象,Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + * @param timeout 时间 + * @param timeUnit 时间颗粒度 + */ + public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) + { + redisTemplate.opsForValue().set(key, value, timeout, timeUnit); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @return true=设置成功;false=设置失败 + */ + public boolean expire(final String key, final long timeout) + { + return expire(key, timeout, TimeUnit.SECONDS); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @param unit 时间单位 + * @return true=设置成功;false=设置失败 + */ + public boolean expire(final String key, final long timeout, final TimeUnit unit) + { + return redisTemplate.expire(key, timeout, unit); + } + + /** + * 获取有效时间 + * + * @param key Redis键 + * @return 有效时间 + */ + public long getExpire(final String key) + { + return redisTemplate.getExpire(key); + } + + /** + * 判断 key是否存在 + * + * @param key 键 + * @return true 存在 false不存在 + */ + public Boolean hasKey(String key) + { + return redisTemplate.hasKey(key); + } + + /** + * 获得缓存的基本对象。 + * + * @param key 缓存键值 + * @return 缓存键值对应的数据 + */ + public T getCacheObject(final String key) + { + ValueOperations operation = redisTemplate.opsForValue(); + return operation.get(key); + } + + /** + * 删除单个对象 + * + * @param key + */ + public boolean deleteObject(final String key) + { + return redisTemplate.delete(key); + } + + /** + * 删除集合对象 + * + * @param collection 多个对象 + * @return + */ + public boolean deleteObject(final Collection collection) + { + return redisTemplate.delete(collection) > 0; + } + + /** + * 缓存List数据 + * + * @param key 缓存的键值 + * @param dataList 待缓存的List数据 + * @return 缓存的对象 + */ + public long setCacheList(final String key, final List dataList) + { + Long count = redisTemplate.opsForList().rightPushAll(key, dataList); + return count == null ? 0 : count; + } + + /** + * 获得缓存的list对象 + * + * @param key 缓存的键值 + * @return 缓存键值对应的数据 + */ + public List getCacheList(final String key) + { + return redisTemplate.opsForList().range(key, 0, -1); + } + + /** + * 缓存Set + * + * @param key 缓存键值 + * @param dataSet 缓存的数据 + * @return 缓存数据的对象 + */ + public BoundSetOperations setCacheSet(final String key, final Set dataSet) + { + BoundSetOperations setOperation = redisTemplate.boundSetOps(key); + Iterator it = dataSet.iterator(); + while (it.hasNext()) + { + setOperation.add(it.next()); + } + return setOperation; + } + + /** + * 获得缓存的set + * + * @param key + * @return + */ + public Set getCacheSet(final String key) + { + return redisTemplate.opsForSet().members(key); + } + + /** + * 缓存Map + * + * @param key + * @param dataMap + */ + public void setCacheMap(final String key, final Map dataMap) + { + if (dataMap != null) { + redisTemplate.opsForHash().putAll(key, dataMap); + } + } + + /** + * 获得缓存的Map + * + * @param key + * @return + */ + public Map getCacheMap(final String key) + { + return redisTemplate.opsForHash().entries(key); + } + + /** + * 往Hash中存入数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @param value 值 + */ + public void setCacheMapValue(final String key, final String hKey, final T value) + { + redisTemplate.opsForHash().put(key, hKey, value); + } + + /** + * 获取Hash中的数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @return Hash中的对象 + */ + public T getCacheMapValue(final String key, final String hKey) + { + HashOperations opsForHash = redisTemplate.opsForHash(); + return opsForHash.get(key, hKey); + } + + /** + * 获取多个Hash中的数据 + * + * @param key Redis键 + * @param hKeys Hash键集合 + * @return Hash对象集合 + */ + public List getMultiCacheMapValue(final String key, final Collection hKeys) + { + return redisTemplate.opsForHash().multiGet(key, hKeys); + } + + /** + * 删除Hash中的某条数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @return 是否成功 + */ + public boolean deleteCacheMapValue(final String key, final String hKey) + { + return redisTemplate.opsForHash().delete(key, hKey) > 0; + } + + /** + * 获得缓存的基本对象列表 + * + * @param pattern 字符串前缀 + * @return 对象列表 + */ + public Collection keys(final String pattern) + { + return redisTemplate.keys(pattern); + } +} diff --git a/zeroerroa-common/zeroerroa-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b0c399f --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.zeroerr.common.redis.configure.RedisConfig +com.zeroerr.common.redis.service.RedisService diff --git a/zeroerroa-common/zeroerroa-common-seata/pom.xml b/zeroerroa-common/zeroerroa-common-seata/pom.xml new file mode 100644 index 0000000..7d4ac70 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-seata/pom.xml @@ -0,0 +1,27 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-seata + + + zeroerroa-common-seata分布式事务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-seata + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-security/pom.xml b/zeroerroa-common/zeroerroa-common-security/pom.xml new file mode 100644 index 0000000..ff5fbf4 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/pom.xml @@ -0,0 +1,39 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-security + + + zeroerroa-common-security安全模块 + + + + + + + org.springframework + spring-webmvc + + + + + com.zeroerr + zeroerroa-api-system + + + + + com.zeroerr + zeroerroa-common-redis + + + + + diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableCustomConfig.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableCustomConfig.java new file mode 100644 index 0000000..2fb2b86 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableCustomConfig.java @@ -0,0 +1,31 @@ +package com.zeroerr.common.security.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.context.annotation.Import; +import org.springframework.scheduling.annotation.EnableAsync; +import com.zeroerr.common.security.config.ApplicationConfig; +import com.zeroerr.common.security.feign.FeignAutoConfiguration; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +// 表示通过aop框架暴露该代理对象,AopContext能够访问 +@EnableAspectJAutoProxy(exposeProxy = true) +// 指定要扫描的Mapper类的包的路径 +@MapperScan("com.zeroerr.**.mapper") +// 开启线程异步执行 +@EnableAsync +// 自动加载类 +@Import({ ApplicationConfig.class, FeignAutoConfiguration.class }) +public @interface EnableCustomConfig +{ + +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableRyFeignClients.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableRyFeignClients.java new file mode 100644 index 0000000..bd9b2c5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/EnableRyFeignClients.java @@ -0,0 +1,27 @@ +package com.zeroerr.common.security.annotation; + +import org.springframework.cloud.openfeign.EnableFeignClients; +import java.lang.annotation.*; + +/** + * 自定义feign注解 + * 添加basePackages路径 + * + * @author ruoyi + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@EnableFeignClients +public @interface EnableRyFeignClients +{ + String[] value() default {}; + + String[] basePackages() default { "com.zeroerr" }; + + Class[] basePackageClasses() default {}; + + Class[] defaultConfiguration() default {}; + + Class[] clients() default {}; +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/InnerAuth.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/InnerAuth.java new file mode 100644 index 0000000..15bae57 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/InnerAuth.java @@ -0,0 +1,19 @@ +package com.zeroerr.common.security.annotation; + +import java.lang.annotation.*; + +/** + * 内部认证注解 + * + * @author ruoyi + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface InnerAuth +{ + /** + * 是否校验用户信息 + */ + boolean isUser() default false; +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/Logical.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/Logical.java new file mode 100644 index 0000000..36d4160 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/Logical.java @@ -0,0 +1,20 @@ +package com.zeroerr.common.security.annotation; + +/** + * 权限注解的验证模式 + * + * @author ruoyi + * + */ +public enum Logical +{ + /** + * 必须具有所有的元素 + */ + AND, + + /** + * 只需具有其中一个元素 + */ + OR +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresLogin.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresLogin.java new file mode 100644 index 0000000..b4fdd0b --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresLogin.java @@ -0,0 +1,18 @@ +package com.zeroerr.common.security.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 登录认证:只有登录之后才能进入该方法 + * + * @author ruoyi + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface RequiresLogin +{ +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresPermissions.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresPermissions.java new file mode 100644 index 0000000..8f3edac --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresPermissions.java @@ -0,0 +1,27 @@ +package com.zeroerr.common.security.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 权限认证:必须具有指定权限才能进入该方法 + * + * @author ruoyi + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface RequiresPermissions +{ + /** + * 需要校验的权限码 + */ + String[] value() default {}; + + /** + * 验证模式:AND | OR,默认AND + */ + Logical logical() default Logical.AND; +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresRoles.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresRoles.java new file mode 100644 index 0000000..6194936 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/annotation/RequiresRoles.java @@ -0,0 +1,26 @@ +package com.zeroerr.common.security.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 角色认证:必须具有指定角色标识才能进入该方法 + * + * @author ruoyi + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface RequiresRoles +{ + /** + * 需要校验的角色标识 + */ + String[] value() default {}; + + /** + * 验证逻辑:AND | OR,默认AND + */ + Logical logical() default Logical.AND; +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/InnerAuthAspect.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/InnerAuthAspect.java new file mode 100644 index 0000000..3669629 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/InnerAuthAspect.java @@ -0,0 +1,51 @@ +package com.zeroerr.common.security.aspect; + +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.core.Ordered; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.exception.InnerAuthException; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.annotation.InnerAuth; + +/** + * 内部服务调用验证处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class InnerAuthAspect implements Ordered +{ + @Around("@annotation(innerAuth)") + public Object innerAround(ProceedingJoinPoint point, InnerAuth innerAuth) throws Throwable + { + String source = ServletUtils.getRequest().getHeader(SecurityConstants.FROM_SOURCE); + // 内部请求验证 + if (!StringUtils.equals(SecurityConstants.INNER, source)) + { + throw new InnerAuthException("没有内部访问权限,不允许访问"); + } + + String userid = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USER_ID); + String username = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USERNAME); + // 用户信息验证 + if (innerAuth.isUser() && (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))) + { + throw new InnerAuthException("没有设置用户信息,不允许访问 "); + } + return point.proceed(); + } + + /** + * 确保在权限认证aop执行前执行 + */ + @Override + public int getOrder() + { + return Ordered.HIGHEST_PRECEDENCE + 1; + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/PreAuthorizeAspect.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/PreAuthorizeAspect.java new file mode 100644 index 0000000..818eea3 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/aspect/PreAuthorizeAspect.java @@ -0,0 +1,97 @@ +package com.zeroerr.common.security.aspect; + +import java.lang.reflect.Method; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.stereotype.Component; +import com.zeroerr.common.security.annotation.RequiresLogin; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.annotation.RequiresRoles; +import com.zeroerr.common.security.auth.AuthUtil; + +/** + * 基于 Spring Aop 的注解鉴权 + * + * @author kong + */ +@Aspect +@Component +public class PreAuthorizeAspect +{ + /** + * 构建 + */ + public PreAuthorizeAspect() + { + } + + /** + * 定义AOP签名 (切入所有使用鉴权注解的方法) + */ + public static final String POINTCUT_SIGN = " @annotation(com.zeroerr.common.security.annotation.RequiresLogin) || " + + "@annotation(com.zeroerr.common.security.annotation.RequiresPermissions) || " + + "@annotation(com.zeroerr.common.security.annotation.RequiresRoles)"; + + /** + * 声明AOP签名 + */ + @Pointcut(POINTCUT_SIGN) + public void pointcut() + { + } + + /** + * 环绕切入 + * + * @param joinPoint 切面对象 + * @return 底层方法执行后的返回值 + * @throws Throwable 底层方法抛出的异常 + */ + @Around("pointcut()") + public Object around(ProceedingJoinPoint joinPoint) throws Throwable + { + // 注解鉴权 + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + checkMethodAnnotation(signature.getMethod()); + try + { + // 执行原有逻辑 + Object obj = joinPoint.proceed(); + return obj; + } + catch (Throwable e) + { + throw e; + } + } + + /** + * 对一个Method对象进行注解检查 + */ + public void checkMethodAnnotation(Method method) + { + // 校验 @RequiresLogin 注解 + RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class); + if (requiresLogin != null) + { + AuthUtil.checkLogin(); + } + + // 校验 @RequiresRoles 注解 + RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class); + if (requiresRoles != null) + { + AuthUtil.checkRole(requiresRoles); + } + + // 校验 @RequiresPermissions 注解 + RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class); + if (requiresPermissions != null) + { + AuthUtil.checkPermi(requiresPermissions); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthLogic.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthLogic.java new file mode 100644 index 0000000..ab9aa1a --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthLogic.java @@ -0,0 +1,373 @@ +package com.zeroerr.common.security.auth; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.springframework.util.PatternMatchUtils; +import com.zeroerr.common.core.context.SecurityContextHolder; +import com.zeroerr.common.core.exception.auth.NotLoginException; +import com.zeroerr.common.core.exception.auth.NotPermissionException; +import com.zeroerr.common.core.exception.auth.NotRoleException; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.annotation.Logical; +import com.zeroerr.common.security.annotation.RequiresLogin; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.annotation.RequiresRoles; +import com.zeroerr.common.security.service.TokenService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.model.LoginUser; + +/** + * Token 权限验证,逻辑实现类 + * + * @author ruoyi + */ +public class AuthLogic +{ + /** 所有权限标识 */ + private static final String ALL_PERMISSION = "*:*:*"; + + /** 管理员角色权限标识 */ + private static final String SUPER_ADMIN = "admin"; + + public TokenService tokenService = SpringUtils.getBean(TokenService.class); + + /** + * 会话注销 + */ + public void logout() + { + String token = SecurityUtils.getToken(); + if (token == null) + { + return; + } + logoutByToken(token); + } + + /** + * 会话注销,根据指定Token + */ + public void logoutByToken(String token) + { + tokenService.delLoginUser(token); + } + + /** + * 检验用户是否已经登录,如未登录,则抛出异常 + */ + public void checkLogin() + { + getLoginUser(); + } + + /** + * 获取当前用户缓存信息, 如果未登录,则抛出异常 + * + * @return 用户缓存信息 + */ + public LoginUser getLoginUser() + { + String token = SecurityUtils.getToken(); + if (token == null) + { + throw new NotLoginException("未提供token"); + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser == null) + { + throw new NotLoginException("无效的token"); + } + return loginUser; + } + + /** + * 获取当前用户缓存信息, 如果未登录,则抛出异常 + * + * @param token 前端传递的认证信息 + * @return 用户缓存信息 + */ + public LoginUser getLoginUser(String token) + { + return tokenService.getLoginUser(token); + } + + /** + * 验证当前用户有效期, 如果相差不足120分钟,自动刷新缓存 + * + * @param loginUser 当前用户信息 + */ + public void verifyLoginUserExpire(LoginUser loginUser) + { + tokenService.verifyToken(loginUser); + } + + /** + * 验证用户是否具备某权限 + * + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + public boolean hasPermi(String permission) + { + return hasPermi(getPermiList(), permission); + } + + /** + * 验证用户是否具备某权限, 如果验证未通过,则抛出异常: NotPermissionException + * + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + public void checkPermi(String permission) + { + if (!hasPermi(getPermiList(), permission)) + { + throw new NotPermissionException(permission); + } + } + + /** + * 根据注解(@RequiresPermissions)鉴权, 如果验证未通过,则抛出异常: NotPermissionException + * + * @param requiresPermissions 注解对象 + */ + public void checkPermi(RequiresPermissions requiresPermissions) + { + SecurityContextHolder.setPermission(StringUtils.join(requiresPermissions.value(), ",")); + if (requiresPermissions.logical() == Logical.AND) + { + checkPermiAnd(requiresPermissions.value()); + } + else + { + checkPermiOr(requiresPermissions.value()); + } + } + + /** + * 验证用户是否含有指定权限,必须全部拥有 + * + * @param permissions 权限列表 + */ + public void checkPermiAnd(String... permissions) + { + Set permissionList = getPermiList(); + for (String permission : permissions) + { + if (!hasPermi(permissionList, permission)) + { + throw new NotPermissionException(permission); + } + } + } + + /** + * 验证用户是否含有指定权限,只需包含其中一个 + * + * @param permissions 权限码数组 + */ + public void checkPermiOr(String... permissions) + { + Set permissionList = getPermiList(); + for (String permission : permissions) + { + if (hasPermi(permissionList, permission)) + { + return; + } + } + if (permissions.length > 0) + { + throw new NotPermissionException(permissions); + } + } + + /** + * 判断用户是否拥有某个角色 + * + * @param role 角色标识 + * @return 用户是否具备某角色 + */ + public boolean hasRole(String role) + { + return hasRole(getRoleList(), role); + } + + /** + * 判断用户是否拥有某个角色, 如果验证未通过,则抛出异常: NotRoleException + * + * @param role 角色标识 + */ + public void checkRole(String role) + { + if (!hasRole(role)) + { + throw new NotRoleException(role); + } + } + + /** + * 根据注解(@RequiresRoles)鉴权 + * + * @param requiresRoles 注解对象 + */ + public void checkRole(RequiresRoles requiresRoles) + { + if (requiresRoles.logical() == Logical.AND) + { + checkRoleAnd(requiresRoles.value()); + } + else + { + checkRoleOr(requiresRoles.value()); + } + } + + /** + * 验证用户是否含有指定角色,必须全部拥有 + * + * @param roles 角色标识数组 + */ + public void checkRoleAnd(String... roles) + { + Set roleList = getRoleList(); + for (String role : roles) + { + if (!hasRole(roleList, role)) + { + throw new NotRoleException(role); + } + } + } + + /** + * 验证用户是否含有指定角色,只需包含其中一个 + * + * @param roles 角色标识数组 + */ + public void checkRoleOr(String... roles) + { + Set roleList = getRoleList(); + for (String role : roles) + { + if (hasRole(roleList, role)) + { + return; + } + } + if (roles.length > 0) + { + throw new NotRoleException(roles); + } + } + + /** + * 根据注解(@RequiresLogin)鉴权 + * + * @param at 注解对象 + */ + public void checkByAnnotation(RequiresLogin at) + { + this.checkLogin(); + } + + /** + * 根据注解(@RequiresRoles)鉴权 + * + * @param at 注解对象 + */ + public void checkByAnnotation(RequiresRoles at) + { + String[] roleArray = at.value(); + if (at.logical() == Logical.AND) + { + this.checkRoleAnd(roleArray); + } + else + { + this.checkRoleOr(roleArray); + } + } + + /** + * 根据注解(@RequiresPermissions)鉴权 + * + * @param at 注解对象 + */ + public void checkByAnnotation(RequiresPermissions at) + { + String[] permissionArray = at.value(); + if (at.logical() == Logical.AND) + { + this.checkPermiAnd(permissionArray); + } + else + { + this.checkPermiOr(permissionArray); + } + } + + /** + * 获取当前账号的角色列表 + * + * @return 角色列表 + */ + public Set getRoleList() + { + try + { + LoginUser loginUser = getLoginUser(); + return loginUser.getRoles(); + } + catch (Exception e) + { + return new HashSet<>(); + } + } + + /** + * 获取当前账号的权限列表 + * + * @return 权限列表 + */ + public Set getPermiList() + { + try + { + LoginUser loginUser = getLoginUser(); + return loginUser.getPermissions(); + } + catch (Exception e) + { + return new HashSet<>(); + } + } + + /** + * 判断是否包含权限 + * + * @param authorities 权限列表 + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + public boolean hasPermi(Collection authorities, String permission) + { + return authorities.stream().filter(StringUtils::hasText) + .anyMatch(x -> ALL_PERMISSION.equals(x) || PatternMatchUtils.simpleMatch(x, permission)); + } + + /** + * 判断是否包含角色 + * + * @param roles 角色列表 + * @param role 角色 + * @return 用户是否具备某角色权限 + */ + public boolean hasRole(Collection roles, String role) + { + return roles.stream().filter(StringUtils::hasText) + .anyMatch(x -> SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role)); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthUtil.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthUtil.java new file mode 100644 index 0000000..4714523 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/auth/AuthUtil.java @@ -0,0 +1,167 @@ +package com.zeroerr.common.security.auth; + +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.annotation.RequiresRoles; +import com.zeroerr.system.api.model.LoginUser; + +/** + * Token 权限验证工具类 + * + * @author ruoyi + */ +public class AuthUtil +{ + /** + * 底层的 AuthLogic 对象 + */ + public static AuthLogic authLogic = new AuthLogic(); + + /** + * 会话注销 + */ + public static void logout() + { + authLogic.logout(); + } + + /** + * 会话注销,根据指定Token + * + * @param token 指定token + */ + public static void logoutByToken(String token) + { + authLogic.logoutByToken(token); + } + + /** + * 检验当前会话是否已经登录,如未登录,则抛出异常 + */ + public static void checkLogin() + { + authLogic.checkLogin(); + } + + /** + * 获取当前登录用户信息 + * + * @param token 指定token + * @return 用户信息 + */ + public static LoginUser getLoginUser(String token) + { + return authLogic.getLoginUser(token); + } + + /** + * 验证当前用户有效期 + * + * @param loginUser 用户信息 + */ + public static void verifyLoginUserExpire(LoginUser loginUser) + { + authLogic.verifyLoginUserExpire(loginUser); + } + + /** + * 当前账号是否含有指定角色标识, 返回true或false + * + * @param role 角色标识 + * @return 是否含有指定角色标识 + */ + public static boolean hasRole(String role) + { + return authLogic.hasRole(role); + } + + /** + * 当前账号是否含有指定角色标识, 如果验证未通过,则抛出异常: NotRoleException + * + * @param role 角色标识 + */ + public static void checkRole(String role) + { + authLogic.checkRole(role); + } + + /** + * 根据注解传入参数鉴权, 如果验证未通过,则抛出异常: NotRoleException + * + * @param requiresRoles 角色权限注解 + */ + public static void checkRole(RequiresRoles requiresRoles) + { + authLogic.checkRole(requiresRoles); + } + + /** + * 当前账号是否含有指定角色标识 [指定多个,必须全部验证通过] + * + * @param roles 角色标识数组 + */ + public static void checkRoleAnd(String... roles) + { + authLogic.checkRoleAnd(roles); + } + + /** + * 当前账号是否含有指定角色标识 [指定多个,只要其一验证通过即可] + * + * @param roles 角色标识数组 + */ + public static void checkRoleOr(String... roles) + { + authLogic.checkRoleOr(roles); + } + + /** + * 当前账号是否含有指定权限, 返回true或false + * + * @param permission 权限码 + * @return 是否含有指定权限 + */ + public static boolean hasPermi(String permission) + { + return authLogic.hasPermi(permission); + } + + /** + * 当前账号是否含有指定权限, 如果验证未通过,则抛出异常: NotPermissionException + * + * @param permission 权限码 + */ + public static void checkPermi(String permission) + { + authLogic.checkPermi(permission); + } + + /** + * 根据注解传入参数鉴权, 如果验证未通过,则抛出异常: NotPermissionException + * + * @param requiresPermissions 权限注解 + */ + public static void checkPermi(RequiresPermissions requiresPermissions) + { + authLogic.checkPermi(requiresPermissions); + } + + /** + * 当前账号是否含有指定权限 [指定多个,必须全部验证通过] + * + * @param permissions 权限码数组 + */ + public static void checkPermiAnd(String... permissions) + { + authLogic.checkPermiAnd(permissions); + } + + /** + * 当前账号是否含有指定权限 [指定多个,只要其一验证通过即可] + * + * @param permissions 权限码数组 + */ + public static void checkPermiOr(String... permissions) + { + authLogic.checkPermiOr(permissions); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/ApplicationConfig.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/ApplicationConfig.java new file mode 100644 index 0000000..d8c490d --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/ApplicationConfig.java @@ -0,0 +1,22 @@ +package com.zeroerr.common.security.config; + +import java.util.TimeZone; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; + +/** + * 系统配置 + * + * @author ruoyi + */ +public class ApplicationConfig +{ + /** + * 时区配置 + */ + @Bean + public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() + { + return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/WebMvcConfig.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/WebMvcConfig.java new file mode 100644 index 0000000..18040d3 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/config/WebMvcConfig.java @@ -0,0 +1,33 @@ +package com.zeroerr.common.security.config; + +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import com.zeroerr.common.security.interceptor.HeaderInterceptor; + +/** + * 拦截器配置 + * + * @author ruoyi + */ +public class WebMvcConfig implements WebMvcConfigurer +{ + /** 不需要拦截地址 */ + public static final String[] excludeUrls = { "/login", "/logout", "/refresh" }; + + @Override + public void addInterceptors(InterceptorRegistry registry) + { + registry.addInterceptor(getHeaderInterceptor()) + .addPathPatterns("/**") + .excludePathPatterns(excludeUrls) + .order(-10); + } + + /** + * 自定义请求头拦截器 + */ + public HeaderInterceptor getHeaderInterceptor() + { + return new HeaderInterceptor(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignAutoConfiguration.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignAutoConfiguration.java new file mode 100644 index 0000000..73e3e19 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignAutoConfiguration.java @@ -0,0 +1,20 @@ +package com.zeroerr.common.security.feign; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import feign.RequestInterceptor; + +/** + * Feign 配置注册 + * + * @author ruoyi + **/ +@Configuration +public class FeignAutoConfiguration +{ + @Bean + public RequestInterceptor requestInterceptor() + { + return new FeignRequestInterceptor(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignRequestInterceptor.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignRequestInterceptor.java new file mode 100644 index 0000000..14c961a --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/feign/FeignRequestInterceptor.java @@ -0,0 +1,54 @@ +package com.zeroerr.common.security.feign; + +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.ip.IpUtils; +import feign.RequestInterceptor; +import feign.RequestTemplate; + +/** + * feign 请求拦截器 + * + * @author ruoyi + */ +@Component +public class FeignRequestInterceptor implements RequestInterceptor +{ + @Override + public void apply(RequestTemplate requestTemplate) + { + HttpServletRequest httpServletRequest = ServletUtils.getRequest(); + if (StringUtils.isNotNull(httpServletRequest)) + { + Map headers = ServletUtils.getHeaders(httpServletRequest); + // 传递用户信息请求头,防止丢失 + String userId = headers.get(SecurityConstants.DETAILS_USER_ID); + if (StringUtils.isNotEmpty(userId)) + { + requestTemplate.header(SecurityConstants.DETAILS_USER_ID, userId); + } + String userKey = headers.get(SecurityConstants.USER_KEY); + if (StringUtils.isNotEmpty(userKey)) + { + requestTemplate.header(SecurityConstants.USER_KEY, userKey); + } + String userName = headers.get(SecurityConstants.DETAILS_USERNAME); + if (StringUtils.isNotEmpty(userName)) + { + requestTemplate.header(SecurityConstants.DETAILS_USERNAME, userName); + } + String authentication = headers.get(SecurityConstants.AUTHORIZATION_HEADER); + if (StringUtils.isNotEmpty(authentication)) + { + requestTemplate.header(SecurityConstants.AUTHORIZATION_HEADER, authentication); + } + + // 配置客户端IP + requestTemplate.header("X-Forwarded-For", IpUtils.getIpAddr()); + } + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/handler/GlobalExceptionHandler.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..90c5863 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/handler/GlobalExceptionHandler.java @@ -0,0 +1,166 @@ +package com.zeroerr.common.security.handler; + +import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.validation.BindException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingPathVariableException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import com.zeroerr.common.core.constant.HttpStatus; +import com.zeroerr.common.core.exception.DemoModeException; +import com.zeroerr.common.core.exception.InnerAuthException; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.exception.auth.NotPermissionException; +import com.zeroerr.common.core.exception.auth.NotRoleException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.html.EscapeUtil; +import com.zeroerr.common.core.web.domain.AjaxResult; + +/** + * 全局异常处理器 + * + * @author ruoyi + */ +@RestControllerAdvice +public class GlobalExceptionHandler +{ + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + /** + * 权限码异常 + */ + @ExceptionHandler(NotPermissionException.class) + public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',权限码校验失败'{}'", requestURI, e.getMessage()); + return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限,请联系管理员授权"); + } + + /** + * 角色权限异常 + */ + @ExceptionHandler(NotRoleException.class) + public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',角色权限校验失败'{}'", requestURI, e.getMessage()); + return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限,请联系管理员授权"); + } + + /** + * 请求方式不支持 + */ + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod()); + return AjaxResult.error(e.getMessage()); + } + + /** + * 业务异常 + */ + @ExceptionHandler(ServiceException.class) + public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) + { + log.error(e.getMessage(), e); + Integer code = e.getCode(); + return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage()); + } + + /** + * 请求路径中缺少必需的路径变量 + */ + @ExceptionHandler(MissingPathVariableException.class) + public AjaxResult handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI, e); + return AjaxResult.error(String.format("请求路径中缺少必需的路径变量[%s]", e.getVariableName())); + } + + /** + * 请求参数类型不匹配 + */ + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public AjaxResult handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + String value = Convert.toStr(e.getValue()); + if (StringUtils.isNotEmpty(value)) + { + value = EscapeUtil.clean(value); + } + log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI, e); + return AjaxResult.error(String.format("请求参数类型不匹配,参数[%s]要求类型为:'%s',但输入值为:'%s'", e.getName(), e.getRequiredType().getName(), value)); + } + + /** + * 拦截未知的运行时异常 + */ + @ExceptionHandler(RuntimeException.class) + public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',发生未知异常.", requestURI, e); + return AjaxResult.error(e.getMessage()); + } + + /** + * 系统异常 + */ + @ExceptionHandler(Exception.class) + public AjaxResult handleException(Exception e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',发生系统异常.", requestURI, e); + return AjaxResult.error(e.getMessage()); + } + + /** + * 自定义验证异常 + */ + @ExceptionHandler(BindException.class) + public AjaxResult handleBindException(BindException e) + { + log.error(e.getMessage(), e); + String message = e.getAllErrors().get(0).getDefaultMessage(); + return AjaxResult.error(message); + } + + /** + * 自定义验证异常 + */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) + { + log.error(e.getMessage(), e); + String message = e.getBindingResult().getFieldError().getDefaultMessage(); + return AjaxResult.error(message); + } + + /** + * 内部认证异常 + */ + @ExceptionHandler(InnerAuthException.class) + public AjaxResult handleInnerAuthException(InnerAuthException e) + { + return AjaxResult.error(e.getMessage()); + } + + /** + * 演示模式异常 + */ + @ExceptionHandler(DemoModeException.class) + public AjaxResult handleDemoModeException(DemoModeException e) + { + return AjaxResult.error("演示模式,不允许操作"); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/interceptor/HeaderInterceptor.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/interceptor/HeaderInterceptor.java new file mode 100644 index 0000000..a60c554 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/interceptor/HeaderInterceptor.java @@ -0,0 +1,54 @@ +package com.zeroerr.common.security.interceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.AsyncHandlerInterceptor; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.context.SecurityContextHolder; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.auth.AuthUtil; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 自定义请求头拦截器,将Header数据封装到线程变量中方便获取 + * 注意:此拦截器会同时验证当前用户有效期自动刷新有效期 + * + * @author ruoyi + */ +public class HeaderInterceptor implements AsyncHandlerInterceptor +{ + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception + { + if (!(handler instanceof HandlerMethod)) + { + return true; + } + + SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID)); + SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME)); + SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY)); + + String token = SecurityUtils.getToken(); + if (StringUtils.isNotEmpty(token)) + { + LoginUser loginUser = AuthUtil.getLoginUser(token); + if (StringUtils.isNotNull(loginUser)) + { + AuthUtil.verifyLoginUserExpire(loginUser); + SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser); + } + } + return true; + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) + throws Exception + { + SecurityContextHolder.remove(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/service/TokenService.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/service/TokenService.java new file mode 100644 index 0000000..47442d4 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/service/TokenService.java @@ -0,0 +1,174 @@ +package com.zeroerr.common.security.service; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.utils.JwtUtils; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.ip.IpUtils; +import com.zeroerr.common.core.utils.uuid.IdUtils; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.model.LoginUser; + +/** + * token验证处理 + * + * @author ruoyi + */ +@Component +public class TokenService +{ + private static final Logger log = LoggerFactory.getLogger(TokenService.class); + + @Autowired + private RedisService redisService; + + protected static final long MILLIS_SECOND = 1000; + + protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; + + private final static long expireTime = CacheConstants.EXPIRATION; + + private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; + + private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; + + /** + * 创建令牌 + */ + public Map createToken(LoginUser loginUser) + { + String token = IdUtils.fastUUID(); + Long userId = loginUser.getSysUser().getUserId(); + String userName = loginUser.getSysUser().getUserName(); + loginUser.setToken(token); + loginUser.setUserid(userId); + loginUser.setUsername(userName); + loginUser.setIpaddr(IpUtils.getIpAddr()); + refreshToken(loginUser); + + // Jwt存储信息 + Map claimsMap = new HashMap(); + claimsMap.put(SecurityConstants.USER_KEY, token); + claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); + + // 接口返回信息 + Map rspMap = new HashMap(); + rspMap.put("access_token", JwtUtils.createToken(claimsMap)); + rspMap.put("expires_in", expireTime); + return rspMap; + } + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUser getLoginUser() + { + return getLoginUser(ServletUtils.getRequest()); + } + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUser getLoginUser(HttpServletRequest request) + { + // 获取请求携带的令牌 + String token = SecurityUtils.getToken(request); + return getLoginUser(token); + } + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUser getLoginUser(String token) + { + LoginUser user = null; + try + { + if (StringUtils.isNotEmpty(token)) + { + String userkey = JwtUtils.getUserKey(token); + user = redisService.getCacheObject(getTokenKey(userkey)); + return user; + } + } + catch (Exception e) + { + log.error("获取用户信息异常'{}'", e.getMessage()); + } + return user; + } + + /** + * 设置用户身份信息 + */ + public void setLoginUser(LoginUser loginUser) + { + if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) + { + refreshToken(loginUser); + } + } + + /** + * 删除用户缓存信息 + */ + public void delLoginUser(String token) + { + if (StringUtils.isNotEmpty(token)) + { + String userkey = JwtUtils.getUserKey(token); + redisService.deleteObject(getTokenKey(userkey)); + } + } + + /** + * 验证令牌有效期,相差不足120分钟,自动刷新缓存 + * + * @param loginUser + */ + public void verifyToken(LoginUser loginUser) + { + long expireTime = loginUser.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginUser); + } + } + + /** + * 刷新令牌有效期 + * + * @param loginUser 登录信息 + */ + public void refreshToken(LoginUser loginUser) + { + loginUser.setLoginTime(System.currentTimeMillis()); + loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); + // 根据uuid将loginUser缓存 + String userKey = getTokenKey(loginUser.getToken()); + redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); + } + + private String getTokenKey(String token) + { + return ACCESS_TOKEN + token; + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/DictUtils.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/DictUtils.java new file mode 100644 index 0000000..846bb11 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/DictUtils.java @@ -0,0 +1,75 @@ +package com.zeroerr.common.security.utils; + +import java.util.Collection; +import java.util.List; +import com.alibaba.fastjson2.JSONArray; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.system.api.domain.SysDictData; + +/** + * 字典工具类 + * + * @author ruoyi + */ +public class DictUtils +{ + /** + * 设置字典缓存 + * + * @param key 参数键 + * @param dictDatas 字典数据列表 + */ + public static void setDictCache(String key, List dictDatas) + { + SpringUtils.getBean(RedisService.class).setCacheObject(getCacheKey(key), dictDatas); + } + + /** + * 获取字典缓存 + * + * @param key 参数键 + * @return dictDatas 字典数据列表 + */ + public static List getDictCache(String key) + { + JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key)); + if (StringUtils.isNotNull(arrayCache)) + { + return arrayCache.toList(SysDictData.class); + } + return null; + } + + /** + * 删除指定字典缓存 + * + * @param key 字典键 + */ + public static void removeDictCache(String key) + { + SpringUtils.getBean(RedisService.class).deleteObject(getCacheKey(key)); + } + + /** + * 清空字典缓存 + */ + public static void clearDictCache() + { + Collection keys = SpringUtils.getBean(RedisService.class).keys(CacheConstants.SYS_DICT_KEY + "*"); + SpringUtils.getBean(RedisService.class).deleteObject(keys); + } + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + public static String getCacheKey(String configKey) + { + return CacheConstants.SYS_DICT_KEY + configKey; + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/SecurityUtils.java b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/SecurityUtils.java new file mode 100644 index 0000000..0630d10 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/java/com/zeroerr/common/security/utils/SecurityUtils.java @@ -0,0 +1,117 @@ +package com.zeroerr.common.security.utils; + +import javax.servlet.http.HttpServletRequest; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.TokenConstants; +import com.zeroerr.common.core.context.SecurityContextHolder; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 权限获取工具类 + * + * @author ruoyi + */ +public class SecurityUtils +{ + /** + * 获取用户ID + */ + public static Long getUserId() + { + return SecurityContextHolder.getUserId(); + } + + /** + * 获取用户名称 + */ + public static String getUsername() + { + return SecurityContextHolder.getUserName(); + } + + /** + * 获取用户key + */ + public static String getUserKey() + { + return SecurityContextHolder.getUserKey(); + } + + /** + * 获取登录用户信息 + */ + public static LoginUser getLoginUser() + { + return SecurityContextHolder.get(SecurityConstants.LOGIN_USER, LoginUser.class); + } + + /** + * 获取请求token + */ + public static String getToken() + { + return getToken(ServletUtils.getRequest()); + } + + /** + * 根据request获取请求token + */ + public static String getToken(HttpServletRequest request) + { + // 从header获取token标识 + String token = request.getHeader(TokenConstants.AUTHENTICATION); + return replaceTokenPrefix(token); + } + + /** + * 裁剪token前缀 + */ + public static String replaceTokenPrefix(String token) + { + // 如果前端设置了令牌前缀,则裁剪掉前缀 + if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) + { + token = token.replaceFirst(TokenConstants.PREFIX, ""); + } + return token; + } + + /** + * 是否为管理员 + * + * @param userId 用户ID + * @return 结果 + */ + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + /** + * 生成BCryptPasswordEncoder密码 + * + * @param password 密码 + * @return 加密字符串 + */ + public static String encryptPassword(String password) + { + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.encode(password); + } + + /** + * 判断密码是否相同 + * + * @param rawPassword 真实密码 + * @param encodedPassword 加密后字符 + * @return 结果 + */ + public static boolean matchesPassword(String rawPassword, String encodedPassword) + { + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.matches(rawPassword, encodedPassword); + } +} diff --git a/zeroerroa-common/zeroerroa-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ba59fad --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.zeroerr.common.security.config.WebMvcConfig +com.zeroerr.common.security.service.TokenService +com.zeroerr.common.security.aspect.PreAuthorizeAspect +com.zeroerr.common.security.aspect.InnerAuthAspect +com.zeroerr.common.security.handler.GlobalExceptionHandler diff --git a/zeroerroa-common/zeroerroa-common-sensitive/pom.xml b/zeroerroa-common/zeroerroa-common-sensitive/pom.xml new file mode 100644 index 0000000..47eaf47 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-sensitive/pom.xml @@ -0,0 +1,27 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-sensitive + + + zeroerroa-common-sensitive数据脱敏 + + + + + + + com.zeroerr + zeroerroa-common-security + + + + \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/annotation/Sensitive.java b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/annotation/Sensitive.java new file mode 100644 index 0000000..999caa1 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/annotation/Sensitive.java @@ -0,0 +1,24 @@ +package com.zeroerr.common.sensitive.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.zeroerr.common.sensitive.config.SensitiveJsonSerializer; +import com.zeroerr.common.sensitive.enums.DesensitizedType; + +/** + * 数据脱敏注解 + * + * @author ruoyi + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +@JacksonAnnotationsInside +@JsonSerialize(using = SensitiveJsonSerializer.class) +public @interface Sensitive +{ + DesensitizedType desensitizedType(); +} diff --git a/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/config/SensitiveJsonSerializer.java b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/config/SensitiveJsonSerializer.java new file mode 100644 index 0000000..c77e0d5 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/config/SensitiveJsonSerializer.java @@ -0,0 +1,67 @@ +package com.zeroerr.common.sensitive.config; + +import java.io.IOException; +import java.util.Objects; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.BeanProperty; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.ContextualSerializer; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.common.sensitive.annotation.Sensitive; +import com.zeroerr.common.sensitive.enums.DesensitizedType; +import com.zeroerr.system.api.model.LoginUser; + +/** + * 数据脱敏序列化过滤 + * + * @author ruoyi + */ +public class SensitiveJsonSerializer extends JsonSerializer implements ContextualSerializer +{ + private DesensitizedType desensitizedType; + + @Override + public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException + { + if (desensitization()) + { + gen.writeString(desensitizedType.desensitizer().apply(value)); + } + else + { + gen.writeString(value); + } + } + + @Override + public JsonSerializer createContextual(SerializerProvider prov, BeanProperty property) + throws JsonMappingException + { + Sensitive annotation = property.getAnnotation(Sensitive.class); + if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) + { + this.desensitizedType = annotation.desensitizedType(); + return this; + } + return prov.findValueSerializer(property.getType(), property); + } + + /** + * 是否需要脱敏处理 + */ + private boolean desensitization() + { + try + { + LoginUser securityUser = SecurityUtils.getLoginUser(); + // 管理员不脱敏 + return !securityUser.getSysUser().isAdmin(); + } + catch (Exception e) + { + return true; + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/enums/DesensitizedType.java b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/enums/DesensitizedType.java new file mode 100644 index 0000000..3a35f50 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/enums/DesensitizedType.java @@ -0,0 +1,59 @@ +package com.zeroerr.common.sensitive.enums; + +import java.util.function.Function; +import com.zeroerr.common.sensitive.utils.DesensitizedUtil; + +/** + * 脱敏类型 + * + * @author ruoyi + */ +public enum DesensitizedType +{ + /** + * 姓名,第2位星号替换 + */ + USERNAME(s -> s.replaceAll("(\\S)\\S(\\S*)", "$1*$2")), + + /** + * 密码,全部字符都用*代替 + */ + PASSWORD(DesensitizedUtil::password), + + /** + * 身份证,中间10位星号替换 + */ + ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{4})", "$1** **** ****$2")), + + /** + * 手机号,中间4位星号替换 + */ + PHONE(s -> s.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")), + + /** + * 电子邮箱,仅显示第一个字母和@后面的地址显示,其他星号替换 + */ + EMAIL(s -> s.replaceAll("(^.)[^@]*(@.*$)", "$1****$2")), + + /** + * 银行卡号,保留最后4位,其他星号替换 + */ + BANK_CARD(s -> s.replaceAll("\\d{15}(\\d{3})", "**** **** **** **** $1")), + + /** + * 车牌号码,包含普通车辆、新能源车辆 + */ + CAR_LICENSE(DesensitizedUtil::carLicense); + + private final Function desensitizer; + + DesensitizedType(Function desensitizer) + { + this.desensitizer = desensitizer; + } + + public Function desensitizer() + { + return desensitizer; + } +} diff --git a/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/utils/DesensitizedUtil.java b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/utils/DesensitizedUtil.java new file mode 100644 index 0000000..b7aa4e2 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-sensitive/src/main/java/com/zeroerr/common/sensitive/utils/DesensitizedUtil.java @@ -0,0 +1,51 @@ +package com.zeroerr.common.sensitive.utils; + +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 脱敏工具类 + * + * @author ruoyi + */ +public class DesensitizedUtil +{ + /** + * 密码的全部字符都用*代替,比如:****** + * + * @param password 密码 + * @return 脱敏后的密码 + */ + public static String password(String password) + { + if (StringUtils.isBlank(password)) + { + return StringUtils.EMPTY; + } + return StringUtils.repeat('*', password.length()); + } + + /** + * 车牌中间用*代替,如果是错误的车牌,不处理 + * + * @param carLicense 完整的车牌号 + * @return 脱敏后的车牌 + */ + public static String carLicense(String carLicense) + { + if (StringUtils.isBlank(carLicense)) + { + return StringUtils.EMPTY; + } + // 普通车牌 + if (carLicense.length() == 7) + { + carLicense = StringUtils.hide(carLicense, 3, 6); + } + else if (carLicense.length() == 8) + { + // 新能源车牌 + carLicense = StringUtils.hide(carLicense, 3, 7); + } + return carLicense; + } +} diff --git a/zeroerroa-common/zeroerroa-common-swagger/pom.xml b/zeroerroa-common/zeroerroa-common-swagger/pom.xml new file mode 100644 index 0000000..115902e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/pom.xml @@ -0,0 +1,34 @@ + + + + com.zeroerr + zeroerroa-common + 3.6.4 + + 4.0.0 + + zeroerroa-common-swagger + + + zeroerroa-common-swagger系统接口 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/annotation/EnableCustomSwagger2.java b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/annotation/EnableCustomSwagger2.java new file mode 100644 index 0000000..c2cd000 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/annotation/EnableCustomSwagger2.java @@ -0,0 +1,20 @@ +package com.zeroerr.common.swagger.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.context.annotation.Import; +import com.zeroerr.common.swagger.config.SwaggerAutoConfiguration; + +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +@Import({ SwaggerAutoConfiguration.class }) +public @interface EnableCustomSwagger2 +{ + +} diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerAutoConfiguration.java b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerAutoConfiguration.java new file mode 100644 index 0000000..1ab4d93 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerAutoConfiguration.java @@ -0,0 +1,123 @@ +package com.zeroerr.common.swagger.config; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Predicate; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.Contact; +import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.SecurityScheme; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.contexts.SecurityContext; +import springfox.documentation.spring.web.plugins.ApiSelectorBuilder; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +@EnableConfigurationProperties(SwaggerProperties.class) +@ConditionalOnProperty(name = "swagger.enabled", matchIfMissing = true) +@Import({SwaggerBeanPostProcessor.class, SwaggerWebConfiguration.class}) +public class SwaggerAutoConfiguration +{ + /** + * 默认的排除路径,排除Spring Boot默认的错误处理路径和端点 + */ + private static final List DEFAULT_EXCLUDE_PATH = Arrays.asList("/error", "/actuator/**"); + + private static final String BASE_PATH = "/**"; + + @Bean + public Docket api(SwaggerProperties swaggerProperties) + { + // base-path处理 + if (swaggerProperties.getBasePath().isEmpty()) + { + swaggerProperties.getBasePath().add(BASE_PATH); + } + // noinspection unchecked + List> basePath = new ArrayList>(); + swaggerProperties.getBasePath().forEach(path -> basePath.add(PathSelectors.ant(path))); + + // exclude-path处理 + if (swaggerProperties.getExcludePath().isEmpty()) + { + swaggerProperties.getExcludePath().addAll(DEFAULT_EXCLUDE_PATH); + } + + List> excludePath = new ArrayList<>(); + swaggerProperties.getExcludePath().forEach(path -> excludePath.add(PathSelectors.ant(path))); + + ApiSelectorBuilder builder = new Docket(DocumentationType.SWAGGER_2).host(swaggerProperties.getHost()) + .apiInfo(apiInfo(swaggerProperties)).select() + .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage())); + + swaggerProperties.getBasePath().forEach(p -> builder.paths(PathSelectors.ant(p))); + swaggerProperties.getExcludePath().forEach(p -> builder.paths(PathSelectors.ant(p).negate())); + + return builder.build().securitySchemes(securitySchemes()).securityContexts(securityContexts()).pathMapping("/"); + } + + /** + * 安全模式,这里指定token通过Authorization头请求头传递 + */ + private List securitySchemes() + { + List apiKeyList = new ArrayList(); + apiKeyList.add(new ApiKey("Authorization", "Authorization", "header")); + return apiKeyList; + } + + /** + * 安全上下文 + */ + private List securityContexts() + { + List securityContexts = new ArrayList<>(); + securityContexts.add( + SecurityContext.builder() + .securityReferences(defaultAuth()) + .operationSelector(o -> o.requestMappingPattern().matches("/.*")) + .build()); + return securityContexts; + } + + /** + * 默认的全局鉴权策略 + * + * @return + */ + private List defaultAuth() + { + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; + authorizationScopes[0] = authorizationScope; + List securityReferences = new ArrayList<>(); + securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); + return securityReferences; + } + + private ApiInfo apiInfo(SwaggerProperties swaggerProperties) + { + return new ApiInfoBuilder() + .title(swaggerProperties.getTitle()) + .description(swaggerProperties.getDescription()) + .license(swaggerProperties.getLicense()) + .licenseUrl(swaggerProperties.getLicenseUrl()) + .termsOfServiceUrl(swaggerProperties.getTermsOfServiceUrl()) + .contact(new Contact(swaggerProperties.getContact().getName(), swaggerProperties.getContact().getUrl(), swaggerProperties.getContact().getEmail())) + .version(swaggerProperties.getVersion()) + .build(); + } +} diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerBeanPostProcessor.java b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerBeanPostProcessor.java new file mode 100644 index 0000000..19416c1 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerBeanPostProcessor.java @@ -0,0 +1,52 @@ +package com.zeroerr.common.swagger.config; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.util.ReflectionUtils; +import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; +import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; +import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; +import java.lang.reflect.Field; +import java.util.List; +import java.util.stream.Collectors; + +/** + * swagger 在 springboot 2.6.x 不兼容问题的处理 + * + * @author ruoyi + */ +public class SwaggerBeanPostProcessor implements BeanPostProcessor +{ + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException + { + if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) + { + customizeSpringfoxHandlerMappings(getHandlerMappings(bean)); + } + return bean; + } + + private void customizeSpringfoxHandlerMappings(List mappings) + { + List copy = mappings.stream().filter(mapping -> mapping.getPatternParser() == null) + .collect(Collectors.toList()); + mappings.clear(); + mappings.addAll(copy); + } + + @SuppressWarnings("unchecked") + private List getHandlerMappings(Object bean) + { + try + { + Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings"); + field.setAccessible(true); + return (List) field.get(bean); + } + catch (IllegalArgumentException | IllegalAccessException e) + { + throw new IllegalStateException(e); + } + } +} diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerProperties.java b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerProperties.java new file mode 100644 index 0000000..07d1922 --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerProperties.java @@ -0,0 +1,343 @@ +package com.zeroerr.common.swagger.config; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("swagger") +public class SwaggerProperties +{ + /** + * 是否开启swagger + */ + private Boolean enabled; + + /** + * swagger会解析的包路径 + **/ + private String basePackage = ""; + + /** + * swagger会解析的url规则 + **/ + private List basePath = new ArrayList<>(); + + /** + * 在basePath基础上需要排除的url规则 + **/ + private List excludePath = new ArrayList<>(); + + /** + * 标题 + **/ + private String title = ""; + + /** + * 描述 + **/ + private String description = ""; + + /** + * 版本 + **/ + private String version = ""; + + /** + * 许可证 + **/ + private String license = ""; + + /** + * 许可证URL + **/ + private String licenseUrl = ""; + + /** + * 服务条款URL + **/ + private String termsOfServiceUrl = ""; + + /** + * host信息 + **/ + private String host = ""; + + /** + * 联系人信息 + */ + private Contact contact = new Contact(); + + /** + * 全局统一鉴权配置 + **/ + private Authorization authorization = new Authorization(); + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled(Boolean enabled) + { + this.enabled = enabled; + } + + public String getBasePackage() + { + return basePackage; + } + + public void setBasePackage(String basePackage) + { + this.basePackage = basePackage; + } + + public List getBasePath() + { + return basePath; + } + + public void setBasePath(List basePath) + { + this.basePath = basePath; + } + + public List getExcludePath() + { + return excludePath; + } + + public void setExcludePath(List excludePath) + { + this.excludePath = excludePath; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getLicense() + { + return license; + } + + public void setLicense(String license) + { + this.license = license; + } + + public String getLicenseUrl() + { + return licenseUrl; + } + + public void setLicenseUrl(String licenseUrl) + { + this.licenseUrl = licenseUrl; + } + + public String getTermsOfServiceUrl() + { + return termsOfServiceUrl; + } + + public void setTermsOfServiceUrl(String termsOfServiceUrl) + { + this.termsOfServiceUrl = termsOfServiceUrl; + } + + public String getHost() + { + return host; + } + + public void setHost(String host) + { + this.host = host; + } + + public Contact getContact() + { + return contact; + } + + public void setContact(Contact contact) + { + this.contact = contact; + } + + public Authorization getAuthorization() + { + return authorization; + } + + public void setAuthorization(Authorization authorization) + { + this.authorization = authorization; + } + + public static class Contact + { + /** + * 联系人 + **/ + private String name = ""; + /** + * 联系人url + **/ + private String url = ""; + /** + * 联系人email + **/ + private String email = ""; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + } + + public static class Authorization + { + /** + * 鉴权策略ID,需要和SecurityReferences ID保持一致 + */ + private String name = ""; + + /** + * 需要开启鉴权URL的正则 + */ + private String authRegex = "^.*$"; + + /** + * 鉴权作用域列表 + */ + private List authorizationScopeList = new ArrayList<>(); + + private List tokenUrlList = new ArrayList<>(); + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getAuthRegex() + { + return authRegex; + } + + public void setAuthRegex(String authRegex) + { + this.authRegex = authRegex; + } + + public List getAuthorizationScopeList() + { + return authorizationScopeList; + } + + public void setAuthorizationScopeList(List authorizationScopeList) + { + this.authorizationScopeList = authorizationScopeList; + } + + public List getTokenUrlList() + { + return tokenUrlList; + } + + public void setTokenUrlList(List tokenUrlList) + { + this.tokenUrlList = tokenUrlList; + } + } + + public static class AuthorizationScope + { + /** + * 作用域名称 + */ + private String scope = ""; + + /** + * 作用域描述 + */ + private String description = ""; + + public String getScope() + { + return scope; + } + + public void setScope(String scope) + { + this.scope = scope; + } + + public String getDescription() + { + return description; + } + + public void setDescription(String description) + { + this.description = description; + } + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerWebConfiguration.java b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerWebConfiguration.java new file mode 100644 index 0000000..1be8bbf --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/java/com/zeroerr/common/swagger/config/SwaggerWebConfiguration.java @@ -0,0 +1,20 @@ +package com.zeroerr.common.swagger.config; + +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * swagger 资源映射路径 + * + * @author ruoyi + */ +public class SwaggerWebConfiguration implements WebMvcConfigurer +{ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** swagger-ui 地址 */ + registry.addResourceHandler("/swagger-ui/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); + } +} \ No newline at end of file diff --git a/zeroerroa-common/zeroerroa-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zeroerroa-common/zeroerroa-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..5b8135e --- /dev/null +++ b/zeroerroa-common/zeroerroa-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +# com.zeroerr.common.swagger.config.SwaggerAutoConfiguration +# com.zeroerr.common.swagger.config.SwaggerWebConfiguration +# com.zeroerr.common.swagger.config.SwaggerBeanPostProcessor diff --git a/zeroerroa-gateway/.drone.yml b/zeroerroa-gateway/.drone.yml new file mode 100644 index 0000000..f5a1a55 --- /dev/null +++ b/zeroerroa-gateway/.drone.yml @@ -0,0 +1,60 @@ +kind: pipeline +type: docker +name: gateway + +steps: + # 1.maven打包 + - name: maven compile + pull: if-not-exists + # 构建镜像的maven+jdk选择,最好选择满足匹配你的项目版本的;这里的maven是maven3 + image: adoptopenjdk/maven-openjdk8 + volumes: + # maven构建缓存,也就是下面的/home/zeroerr/drone/maven/cache + - name: maven-cache + path: /root/.m2 + # 挂载宿主机的目录;也就是下面的/home/zeroerr/drone/maven/build + - name: maven-build + path: /drone/gateway + commands: + # 开始打包maven工程 + - mvn clean package -Dmaven.test.skip=true + # 将打包后的文件复制到宿主机映射目录. + - cp target/*.jar /drone/gateway + - cp Dockerfile /drone/gateway + - cp docker.sh /drone/gateway + - cp start.sh /drone/gateway + + - name: build docker + image: plugins/docker + volumes: + # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置 + - name: maven-build + path: /drone/gateway # 将应用打包好的Jar和执行脚本挂载出来 + - name: docker + path: /var/run/docker.sock # 挂载宿主机的docker + settings: + dockerfile: /drone/gateway/Dockerfile #这里的Dockerfile就是项目根目录里的Dockerfile,必须保证名字和内容无误 + commands: + # 定义在Docker容器中执行的shell命令 + - cd /drone/gateway + - chmod +x docker.sh + - sh docker.sh + - docker ps + + +volumes: # 定义流水线挂载目录,用于共享数据 + - name: maven-build + host: + path: /home/zeroerr/drone/maven/gateway # 从宿主机中挂载的目录 + - name: maven-cache + host: + path: /home/zeroerr/drone/maven/cache # 从宿主机中挂载的目录 + - name: docker + host: + path: /var/run/docker.sock + + +# drone执行触发器 +trigger: + branch: + - master diff --git a/zeroerroa-gateway/Dockerfile b/zeroerroa-gateway/Dockerfile new file mode 100644 index 0000000..3715119 --- /dev/null +++ b/zeroerroa-gateway/Dockerfile @@ -0,0 +1,23 @@ +# 使用 dockette/openjdk8 作为基础镜像 +FROM dockette/openjdk8 + +# 设置环境变量 +ENV SERVIECE_PORT=8080 + +# 创建目录 +RUN mkdir -p /drone/ + +# 设置工作目录 +WORKDIR /drone + +# 复制 start.sh 脚本到容器内 +COPY ./start.sh /drone/ + +# 复制 JAR 文件到容器内 +COPY ./*.jar /drone/ + +# 赋予 /drone/ 目录下所有文件可执行权限 +RUN chmod 755 -R /drone/ + +# 设置容器的入口点 +ENTRYPOINT ["/drone/start.sh"] diff --git a/zeroerroa-gateway/docker.sh b/zeroerroa-gateway/docker.sh new file mode 100644 index 0000000..62cbe8d --- /dev/null +++ b/zeroerroa-gateway/docker.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# 定义应用组名 +group_name='zeroerroa' +# 定义应用名称 +app_name='gateway' +# 定义应用版本 +app_version='latest' +echo '---------- 停止旧容器 ----------' +docker stop ${app_name} +echo '---------- 删除旧容器 ----------' +docker rm ${app_name} +echo '---------- 删除旧镜像 ----------' +docker rmi ${group_name}/${app_name}:${app_version} +echo '---------- 打包新镜像 ----------' +docker build -t ${group_name}/${app_name}:${app_version} . +echo '---------- 运行新镜像 ----------' +docker run -p 8080:8080 --name ${app_name} \ +-e TZ="Asia/Shanghai" \ +-v /etc/localtime:/etc/localtime \ +-d ${group_name}/${app_name}:${app_version} +echo '----start container----' diff --git a/zeroerroa-gateway/pom.xml b/zeroerroa-gateway/pom.xml new file mode 100644 index 0000000..a7ce6d0 --- /dev/null +++ b/zeroerroa-gateway/pom.xml @@ -0,0 +1,110 @@ + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + zeroerroa-gateway + + + zeroerroa-gateway网关模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + + com.alibaba.csp + sentinel-datasource-nacos + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + pro.fessional + kaptcha + + + + + com.zeroerr + zeroerroa-common-redis + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/ZeroErrGatewayApplication.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/ZeroErrGatewayApplication.java new file mode 100644 index 0000000..741d8d1 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/ZeroErrGatewayApplication.java @@ -0,0 +1,29 @@ +package com.zeroerr.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * 网关启动程序 + * + * @author ruoyi + */ +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class ZeroErrGatewayApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrGatewayApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 若依网关启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/CaptchaConfig.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/CaptchaConfig.java new file mode 100644 index 0000000..496ea4b --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/CaptchaConfig.java @@ -0,0 +1,83 @@ +package com.zeroerr.gateway.config; + +import java.util.Properties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import com.google.code.kaptcha.impl.DefaultKaptcha; +import com.google.code.kaptcha.util.Config; +import static com.google.code.kaptcha.Constants.*; + +/** + * 验证码配置 + * + * @author ruoyi + */ +@Configuration +public class CaptchaConfig +{ + @Bean(name = "captchaProducer") + public DefaultKaptcha getKaptchaBean() + { + DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); + Properties properties = new Properties(); + // 是否有边框 默认为true 我们可以自己设置yes,no + properties.setProperty(KAPTCHA_BORDER, "yes"); + // 验证码文本字符颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); + // 验证码图片宽度 默认为200 + properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); + // 验证码图片高度 默认为50 + properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); + // 验证码文本字符大小 默认为40 + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); + // KAPTCHA_SESSION_KEY + properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); + // 验证码文本字符长度 默认为5 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); + // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); + // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy + properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); + Config config = new Config(properties); + defaultKaptcha.setConfig(config); + return defaultKaptcha; + } + + @Bean(name = "captchaProducerMath") + public DefaultKaptcha getKaptchaBeanMath() + { + DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); + Properties properties = new Properties(); + // 是否有边框 默认为true 我们可以自己设置yes,no + properties.setProperty(KAPTCHA_BORDER, "yes"); + // 边框颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90"); + // 验证码文本字符颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue"); + // 验证码图片宽度 默认为200 + properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); + // 验证码图片高度 默认为50 + properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); + // 验证码文本字符大小 默认为40 + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35"); + // KAPTCHA_SESSION_KEY + properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); + // 验证码文本生成器 + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.zeroerr.gateway.config.KaptchaTextCreator"); + // 验证码文本字符间距 默认为2 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); + // 验证码文本字符长度 默认为5 + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6"); + // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) + properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); + // 验证码噪点颜色 默认为Color.BLACK + properties.setProperty(KAPTCHA_NOISE_COLOR, "white"); + // 干扰实现类 + properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise"); + // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy + properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); + Config config = new Config(properties); + defaultKaptcha.setConfig(config); + return defaultKaptcha; + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/GatewayConfig.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/GatewayConfig.java new file mode 100644 index 0000000..390c0c8 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/GatewayConfig.java @@ -0,0 +1,23 @@ +package com.zeroerr.gateway.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import com.zeroerr.gateway.handler.SentinelFallbackHandler; + +/** + * 网关限流配置 + * + * @author ruoyi + */ +@Configuration +public class GatewayConfig +{ + @Bean + @Order(Ordered.HIGHEST_PRECEDENCE) + public SentinelFallbackHandler sentinelGatewayExceptionHandler() + { + return new SentinelFallbackHandler(); + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/KaptchaTextCreator.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/KaptchaTextCreator.java new file mode 100644 index 0000000..48253e9 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/KaptchaTextCreator.java @@ -0,0 +1,75 @@ +package com.zeroerr.gateway.config; + +import java.util.Random; +import com.google.code.kaptcha.text.impl.DefaultTextCreator; + +/** + * 验证码文本生成器 + * + * @author ruoyi + */ +public class KaptchaTextCreator extends DefaultTextCreator +{ + private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); + + @Override + public String getText() + { + Integer result = 0; + Random random = new Random(); + int x = random.nextInt(10); + int y = random.nextInt(10); + StringBuilder suChinese = new StringBuilder(); + int randomoperands = random.nextInt(3); + if (randomoperands == 0) + { + result = x * y; + suChinese.append(CNUMBERS[x]); + suChinese.append("*"); + suChinese.append(CNUMBERS[y]); + } + else if (randomoperands == 1) + { + if ((x != 0) && y % x == 0) + { + result = y / x; + suChinese.append(CNUMBERS[y]); + suChinese.append("/"); + suChinese.append(CNUMBERS[x]); + } + else + { + result = x + y; + suChinese.append(CNUMBERS[x]); + suChinese.append("+"); + suChinese.append(CNUMBERS[y]); + } + } + else if (randomoperands == 2) + { + if (x >= y) + { + result = x - y; + suChinese.append(CNUMBERS[x]); + suChinese.append("-"); + suChinese.append(CNUMBERS[y]); + } + else + { + result = y - x; + suChinese.append(CNUMBERS[y]); + suChinese.append("-"); + suChinese.append(CNUMBERS[x]); + } + } + else + { + result = x + y; + suChinese.append(CNUMBERS[x]); + suChinese.append("+"); + suChinese.append(CNUMBERS[y]); + } + suChinese.append("=?@" + result); + return suChinese.toString(); + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/RouterFunctionConfiguration.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/RouterFunctionConfiguration.java new file mode 100644 index 0000000..28bb04a --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/RouterFunctionConfiguration.java @@ -0,0 +1,31 @@ +package com.zeroerr.gateway.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.web.reactive.function.server.RequestPredicates; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; +import com.zeroerr.gateway.handler.ValidateCodeHandler; + +/** + * 路由配置信息 + * + * @author ruoyi + */ +@Configuration +public class RouterFunctionConfiguration +{ + @Autowired + private ValidateCodeHandler validateCodeHandler; + + @SuppressWarnings("rawtypes") + @Bean + public RouterFunction routerFunction() + { + return RouterFunctions.route( + RequestPredicates.GET("/code").and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), + validateCodeHandler); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/SwaggerProvider.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/SwaggerProvider.java new file mode 100644 index 0000000..9283413 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/SwaggerProvider.java @@ -0,0 +1,79 @@ +package com.zeroerr.gateway.config; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.config.GatewayProperties; +import org.springframework.cloud.gateway.route.RouteLocator; +import org.springframework.cloud.gateway.support.NameUtils; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.config.ResourceHandlerRegistry; +import org.springframework.web.reactive.config.WebFluxConfigurer; +import springfox.documentation.swagger.web.SwaggerResource; +import springfox.documentation.swagger.web.SwaggerResourcesProvider; + +/** + * 聚合系统接口 + * + * @author ruoyi + */ +@Component +public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer +{ + /** + * Swagger2默认的url后缀 + */ + public static final String SWAGGER2URL = "/v2/api-docs"; + + /** + * 网关路由 + */ + @Lazy + @Autowired + private RouteLocator routeLocator; + + @Autowired + private GatewayProperties gatewayProperties; + + /** + * 聚合其他服务接口 + * + * @return + */ + @Override + public List get() + { + List resourceList = new ArrayList<>(); + List routes = new ArrayList<>(); + // 获取网关中配置的route + routeLocator.getRoutes().subscribe(route -> routes.add(route.getId())); + gatewayProperties.getRoutes().stream() + .filter(routeDefinition -> routes + .contains(routeDefinition.getId())) + .forEach(routeDefinition -> routeDefinition.getPredicates().stream() + .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) + .filter(predicateDefinition -> !"zeroerroa-auth".equalsIgnoreCase(routeDefinition.getId())) + .forEach(predicateDefinition -> resourceList + .add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs() + .get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", SWAGGER2URL))))); + return resourceList; + } + + private SwaggerResource swaggerResource(String name, String location) + { + SwaggerResource swaggerResource = new SwaggerResource(); + swaggerResource.setName(name); + swaggerResource.setLocation(location); + swaggerResource.setSwaggerVersion("2.0"); + return swaggerResource; + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** swagger-ui 地址 */ + registry.addResourceHandler("/swagger-ui/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/"); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/CaptchaProperties.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/CaptchaProperties.java new file mode 100644 index 0000000..3abd950 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/CaptchaProperties.java @@ -0,0 +1,46 @@ +package com.zeroerr.gateway.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * 验证码配置 + * + * @author ruoyi + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "security.captcha") +public class CaptchaProperties +{ + /** + * 验证码开关 + */ + private Boolean enabled; + + /** + * 验证码类型(math 数组计算 char 字符) + */ + private String type; + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled(Boolean enabled) + { + this.enabled = enabled; + } + + public String getType() + { + return type; + } + + public void setType(String type) + { + this.type = type; + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/IgnoreWhiteProperties.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/IgnoreWhiteProperties.java new file mode 100644 index 0000000..60f61aa --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/IgnoreWhiteProperties.java @@ -0,0 +1,33 @@ +package com.zeroerr.gateway.config.properties; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * 放行白名单配置 + * + * @author ruoyi + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "security.ignore") +public class IgnoreWhiteProperties +{ + /** + * 放行白名单配置,网关不校验此处的白名单 + */ + private List whites = new ArrayList<>(); + + public List getWhites() + { + return whites; + } + + public void setWhites(List whites) + { + this.whites = whites; + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/XssProperties.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/XssProperties.java new file mode 100644 index 0000000..0b3ded3 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/config/properties/XssProperties.java @@ -0,0 +1,48 @@ +package com.zeroerr.gateway.config.properties; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * XSS跨站脚本配置 + * + * @author ruoyi + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "security.xss") +public class XssProperties +{ + /** + * Xss开关 + */ + private Boolean enabled; + + /** + * 排除路径 + */ + private List excludeUrls = new ArrayList<>(); + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled(Boolean enabled) + { + this.enabled = enabled; + } + + public List getExcludeUrls() + { + return excludeUrls; + } + + public void setExcludeUrls(List excludeUrls) + { + this.excludeUrls = excludeUrls; + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/AuthFilter.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/AuthFilter.java new file mode 100644 index 0000000..7240993 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/AuthFilter.java @@ -0,0 +1,135 @@ +package com.zeroerr.gateway.filter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.HttpStatus; +import com.zeroerr.common.core.constant.SecurityConstants; +import com.zeroerr.common.core.constant.TokenConstants; +import com.zeroerr.common.core.utils.JwtUtils; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.gateway.config.properties.IgnoreWhiteProperties; +import io.jsonwebtoken.Claims; +import reactor.core.publisher.Mono; + +/** + * 网关鉴权 + * + * @author ruoyi + */ +@Component +public class AuthFilter implements GlobalFilter, Ordered +{ + private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); + + // 排除过滤的 uri 地址,nacos自行添加 + @Autowired + private IgnoreWhiteProperties ignoreWhite; + + @Autowired + private RedisService redisService; + + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) + { + ServerHttpRequest request = exchange.getRequest(); + ServerHttpRequest.Builder mutate = request.mutate(); + + String url = request.getURI().getPath(); + // 跳过不需要验证的路径 + if (StringUtils.matches(url, ignoreWhite.getWhites())) + { + return chain.filter(exchange); + } + String token = getToken(request); + if (StringUtils.isEmpty(token)) + { + return unauthorizedResponse(exchange, "令牌不能为空"); + } + Claims claims = JwtUtils.parseToken(token); + if (claims == null) + { + return unauthorizedResponse(exchange, "令牌已过期或验证不正确!"); + } + String userkey = JwtUtils.getUserKey(claims); + boolean islogin = redisService.hasKey(getTokenKey(userkey)); + if (!islogin) + { + return unauthorizedResponse(exchange, "登录状态已过期"); + } + String userid = JwtUtils.getUserId(claims); + String username = JwtUtils.getUserName(claims); + if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) + { + return unauthorizedResponse(exchange, "令牌验证失败"); + } + + // 设置用户信息到请求 + addHeader(mutate, SecurityConstants.USER_KEY, userkey); + addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid); + addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username); + // 内部请求来源参数清除 + removeHeader(mutate, SecurityConstants.FROM_SOURCE); + return chain.filter(exchange.mutate().request(mutate.build()).build()); + } + + private void addHeader(ServerHttpRequest.Builder mutate, String name, Object value) + { + if (value == null) + { + return; + } + String valueStr = value.toString(); + String valueEncode = ServletUtils.urlEncode(valueStr); + mutate.header(name, valueEncode); + } + + private void removeHeader(ServerHttpRequest.Builder mutate, String name) + { + mutate.headers(httpHeaders -> httpHeaders.remove(name)).build(); + } + + private Mono unauthorizedResponse(ServerWebExchange exchange, String msg) + { + log.error("[鉴权异常处理]请求路径:{}", exchange.getRequest().getPath()); + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), msg, HttpStatus.UNAUTHORIZED); + } + + /** + * 获取缓存key + */ + private String getTokenKey(String token) + { + return CacheConstants.LOGIN_TOKEN_KEY + token; + } + + /** + * 获取请求token + */ + private String getToken(ServerHttpRequest request) + { + String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); + // 如果前端设置了令牌前缀,则裁剪掉前缀 + if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) + { + token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY); + } + return token; + } + + @Override + public int getOrder() + { + return -200; + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/BlackListUrlFilter.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/BlackListUrlFilter.java new file mode 100644 index 0000000..1ba8cfb --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/BlackListUrlFilter.java @@ -0,0 +1,65 @@ +package com.zeroerr.gateway.filter; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; +import org.springframework.cloud.gateway.filter.GatewayFilter; +import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.utils.ServletUtils; + +/** + * 黑名单过滤器 + * + * @author ruoyi + */ +@Component +public class BlackListUrlFilter extends AbstractGatewayFilterFactory +{ + @Override + public GatewayFilter apply(Config config) + { + return (exchange, chain) -> { + + String url = exchange.getRequest().getURI().getPath(); + if (config.matchBlacklist(url)) + { + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求地址不允许访问"); + } + + return chain.filter(exchange); + }; + } + + public BlackListUrlFilter() + { + super(Config.class); + } + + public static class Config + { + private List blacklistUrl; + + private List blacklistUrlPattern = new ArrayList<>(); + + public boolean matchBlacklist(String url) + { + return !blacklistUrlPattern.isEmpty() && blacklistUrlPattern.stream().anyMatch(p -> p.matcher(url).find()); + } + + public List getBlacklistUrl() + { + return blacklistUrl; + } + + public void setBlacklistUrl(List blacklistUrl) + { + this.blacklistUrl = blacklistUrl; + this.blacklistUrlPattern.clear(); + this.blacklistUrl.forEach(url -> { + this.blacklistUrlPattern.add(Pattern.compile(url.replaceAll("\\*\\*", "(.*?)"), Pattern.CASE_INSENSITIVE)); + }); + } + } + +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/CacheRequestFilter.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/CacheRequestFilter.java new file mode 100644 index 0000000..3592ca2 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/CacheRequestFilter.java @@ -0,0 +1,87 @@ +package com.zeroerr.gateway.filter; + +import java.util.Collections; +import java.util.List; +import org.springframework.cloud.gateway.filter.GatewayFilter; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.OrderedGatewayFilter; +import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.cloud.gateway.support.ServerWebExchangeUtils; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +/** + * 获取body请求数据(解决流不能重复读取问题) + * + * @author ruoyi + */ +@Component +public class CacheRequestFilter extends AbstractGatewayFilterFactory +{ + public CacheRequestFilter() + { + super(Config.class); + } + + @Override + public String name() + { + return "CacheRequestFilter"; + } + + @Override + public GatewayFilter apply(Config config) + { + CacheRequestGatewayFilter cacheRequestGatewayFilter = new CacheRequestGatewayFilter(); + Integer order = config.getOrder(); + if (order == null) + { + return cacheRequestGatewayFilter; + } + return new OrderedGatewayFilter(cacheRequestGatewayFilter, order); + } + + public static class CacheRequestGatewayFilter implements GatewayFilter + { + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) + { + // GET DELETE 不过滤 + HttpMethod method = exchange.getRequest().getMethod(); + if (method == null || method == HttpMethod.GET || method == HttpMethod.DELETE) + { + return chain.filter(exchange); + } + return ServerWebExchangeUtils.cacheRequestBodyAndRequest(exchange, (serverHttpRequest) -> { + if (serverHttpRequest == exchange.getRequest()) + { + return chain.filter(exchange); + } + return chain.filter(exchange.mutate().request(serverHttpRequest).build()); + }); + } + } + + @Override + public List shortcutFieldOrder() + { + return Collections.singletonList("order"); + } + + static class Config + { + private Integer order; + + public Integer getOrder() + { + return order; + } + + public void setOrder(Integer order) + { + this.order = order; + } + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/ValidateCodeFilter.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/ValidateCodeFilter.java new file mode 100644 index 0000000..5e47a73 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/ValidateCodeFilter.java @@ -0,0 +1,79 @@ +package com.zeroerr.gateway.filter; + +import java.nio.CharBuffer; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.atomic.AtomicReference; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilter; +import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.core.io.buffer.DataBufferUtils; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.zeroerr.common.core.utils.ServletUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.gateway.config.properties.CaptchaProperties; +import com.zeroerr.gateway.service.ValidateCodeService; +import reactor.core.publisher.Flux; + +/** + * 验证码过滤器 + * + * @author ruoyi + */ +@Component +public class ValidateCodeFilter extends AbstractGatewayFilterFactory +{ + private final static String[] VALIDATE_URL = new String[] { "/auth/login", "/auth/register" }; + + @Autowired + private ValidateCodeService validateCodeService; + + @Autowired + private CaptchaProperties captchaProperties; + + private static final String CODE = "code"; + + private static final String UUID = "uuid"; + + @Override + public GatewayFilter apply(Object config) + { + return (exchange, chain) -> { + ServerHttpRequest request = exchange.getRequest(); + + // 非登录/注册请求或验证码关闭,不处理 + if (!StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled()) + { + return chain.filter(exchange); + } + + try + { + String rspStr = resolveBodyFromRequest(request); + JSONObject obj = JSON.parseObject(rspStr); + validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID)); + } + catch (Exception e) + { + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage()); + } + return chain.filter(exchange); + }; + } + + private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest) + { + // 获取请求体 + Flux body = serverHttpRequest.getBody(); + AtomicReference bodyRef = new AtomicReference<>(); + body.subscribe(buffer -> { + CharBuffer charBuffer = StandardCharsets.UTF_8.decode(buffer.asByteBuffer()); + DataBufferUtils.release(buffer); + bodyRef.set(charBuffer.toString()); + }); + return bodyRef.get(); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/XssFilter.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/XssFilter.java new file mode 100644 index 0000000..5a8649e --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/filter/XssFilter.java @@ -0,0 +1,129 @@ +package com.zeroerr.gateway.filter; + +import java.nio.charset.StandardCharsets; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.core.io.buffer.DataBufferFactory; +import org.springframework.core.io.buffer.DataBufferUtils; +import org.springframework.core.io.buffer.DefaultDataBufferFactory; +import org.springframework.core.io.buffer.NettyDataBufferFactory; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpRequestDecorator; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.html.EscapeUtil; +import com.zeroerr.gateway.config.properties.XssProperties; +import io.netty.buffer.ByteBufAllocator; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 跨站脚本过滤器 + * + * @author ruoyi + */ +@Component +@ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") +public class XssFilter implements GlobalFilter, Ordered +{ + // 跨站脚本的 xss 配置,nacos自行添加 + @Autowired + private XssProperties xss; + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) + { + ServerHttpRequest request = exchange.getRequest(); + // xss开关未开启 或 通过nacos关闭,不过滤 + if (!xss.getEnabled()) + { + return chain.filter(exchange); + } + // GET DELETE 不过滤 + HttpMethod method = request.getMethod(); + if (method == null || method == HttpMethod.GET || method == HttpMethod.DELETE) + { + return chain.filter(exchange); + } + // 非json类型,不过滤 + if (!isJsonRequest(exchange)) + { + return chain.filter(exchange); + } + // excludeUrls 不过滤 + String url = request.getURI().getPath(); + if (StringUtils.matches(url, xss.getExcludeUrls())) + { + return chain.filter(exchange); + } + ServerHttpRequestDecorator httpRequestDecorator = requestDecorator(exchange); + return chain.filter(exchange.mutate().request(httpRequestDecorator).build()); + + } + + private ServerHttpRequestDecorator requestDecorator(ServerWebExchange exchange) + { + ServerHttpRequestDecorator serverHttpRequestDecorator = new ServerHttpRequestDecorator(exchange.getRequest()) + { + @Override + public Flux getBody() + { + Flux body = super.getBody(); + return body.buffer().map(dataBuffers -> { + DataBufferFactory dataBufferFactory = new DefaultDataBufferFactory(); + DataBuffer join = dataBufferFactory.join(dataBuffers); + byte[] content = new byte[join.readableByteCount()]; + join.read(content); + DataBufferUtils.release(join); + String bodyStr = new String(content, StandardCharsets.UTF_8); + // 防xss攻击过滤 + bodyStr = EscapeUtil.clean(bodyStr); + // 转成字节 + byte[] bytes = bodyStr.getBytes(StandardCharsets.UTF_8); + NettyDataBufferFactory nettyDataBufferFactory = new NettyDataBufferFactory(ByteBufAllocator.DEFAULT); + DataBuffer buffer = nettyDataBufferFactory.allocateBuffer(bytes.length); + buffer.write(bytes); + return buffer; + }); + } + + @Override + public HttpHeaders getHeaders() + { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.putAll(super.getHeaders()); + // 由于修改了请求体的body,导致content-length长度不确定,因此需要删除原先的content-length + httpHeaders.remove(HttpHeaders.CONTENT_LENGTH); + httpHeaders.set(HttpHeaders.TRANSFER_ENCODING, "chunked"); + return httpHeaders; + } + + }; + return serverHttpRequestDecorator; + } + + /** + * 是否是Json请求 + * + * @param exchange HTTP请求 + */ + public boolean isJsonRequest(ServerWebExchange exchange) + { + String header = exchange.getRequest().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE); + return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); + } + + @Override + public int getOrder() + { + return -100; + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/GatewayExceptionHandler.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/GatewayExceptionHandler.java new file mode 100644 index 0000000..a2336d0 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/GatewayExceptionHandler.java @@ -0,0 +1,56 @@ +package com.zeroerr.gateway.handler; + +import org.springframework.cloud.gateway.support.NotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ResponseStatusException; +import org.springframework.web.server.ServerWebExchange; +import com.zeroerr.common.core.utils.ServletUtils; +import reactor.core.publisher.Mono; + +/** + * 网关统一异常处理 + * + * @author ruoyi + */ +@Order(-1) +@Configuration +public class GatewayExceptionHandler implements ErrorWebExceptionHandler +{ + private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class); + + @Override + public Mono handle(ServerWebExchange exchange, Throwable ex) + { + ServerHttpResponse response = exchange.getResponse(); + + if (exchange.getResponse().isCommitted()) + { + return Mono.error(ex); + } + + String msg; + + if (ex instanceof NotFoundException) + { + msg = "服务未找到"; + } + else if (ex instanceof ResponseStatusException) + { + ResponseStatusException responseStatusException = (ResponseStatusException) ex; + msg = responseStatusException.getMessage(); + } + else + { + msg = "内部服务器错误"; + } + + log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage()); + + return ServletUtils.webFluxResponseWriter(response, msg); + } +} \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SentinelFallbackHandler.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SentinelFallbackHandler.java new file mode 100644 index 0000000..262a85e --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SentinelFallbackHandler.java @@ -0,0 +1,41 @@ +package com.zeroerr.gateway.handler; + +import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; +import com.alibaba.csp.sentinel.slots.block.BlockException; +import com.zeroerr.common.core.utils.ServletUtils; +import org.springframework.web.reactive.function.server.ServerResponse; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebExceptionHandler; +import reactor.core.publisher.Mono; + +/** + * 自定义限流异常处理 + * + * @author ruoyi + */ +public class SentinelFallbackHandler implements WebExceptionHandler +{ + private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) + { + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数,请稍候再试"); + } + + @Override + public Mono handle(ServerWebExchange exchange, Throwable ex) + { + if (exchange.getResponse().isCommitted()) + { + return Mono.error(ex); + } + if (!BlockException.isBlockException(ex)) + { + return Mono.error(ex); + } + return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange)); + } + + private Mono handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) + { + return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SwaggerHandler.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SwaggerHandler.java new file mode 100644 index 0000000..ad121c8 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/SwaggerHandler.java @@ -0,0 +1,56 @@ +package com.zeroerr.gateway.handler; + +import java.util.Optional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; +import springfox.documentation.swagger.web.SecurityConfiguration; +import springfox.documentation.swagger.web.SecurityConfigurationBuilder; +import springfox.documentation.swagger.web.SwaggerResourcesProvider; +import springfox.documentation.swagger.web.UiConfiguration; +import springfox.documentation.swagger.web.UiConfigurationBuilder; + +@RestController +@RequestMapping("/swagger-resources") +public class SwaggerHandler +{ + @Autowired(required = false) + private SecurityConfiguration securityConfiguration; + + @Autowired(required = false) + private UiConfiguration uiConfiguration; + + private final SwaggerResourcesProvider swaggerResources; + + @Autowired + public SwaggerHandler(SwaggerResourcesProvider swaggerResources) + { + this.swaggerResources = swaggerResources; + } + + @GetMapping("/configuration/security") + public Mono> securityConfiguration() + { + return Mono.just(new ResponseEntity<>( + Optional.ofNullable(securityConfiguration).orElse(SecurityConfigurationBuilder.builder().build()), + HttpStatus.OK)); + } + + @GetMapping("/configuration/ui") + public Mono> uiConfiguration() + { + return Mono.just(new ResponseEntity<>( + Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()), HttpStatus.OK)); + } + + @SuppressWarnings("rawtypes") + @GetMapping("") + public Mono swaggerResources() + { + return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK))); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/ValidateCodeHandler.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/ValidateCodeHandler.java new file mode 100644 index 0000000..74e6d67 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/handler/ValidateCodeHandler.java @@ -0,0 +1,41 @@ +package com.zeroerr.gateway.handler; + +import java.io.IOException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.BodyInserters; +import org.springframework.web.reactive.function.server.HandlerFunction; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; +import com.zeroerr.common.core.exception.CaptchaException; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.gateway.service.ValidateCodeService; +import reactor.core.publisher.Mono; + +/** + * 验证码获取 + * + * @author ruoyi + */ +@Component +public class ValidateCodeHandler implements HandlerFunction +{ + @Autowired + private ValidateCodeService validateCodeService; + + @Override + public Mono handle(ServerRequest serverRequest) + { + AjaxResult ajax; + try + { + ajax = validateCodeService.createCaptcha(); + } + catch (CaptchaException | IOException e) + { + return Mono.error(e); + } + return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); + } +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/ValidateCodeService.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/ValidateCodeService.java new file mode 100644 index 0000000..2540422 --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/ValidateCodeService.java @@ -0,0 +1,23 @@ +package com.zeroerr.gateway.service; + +import java.io.IOException; +import com.zeroerr.common.core.exception.CaptchaException; +import com.zeroerr.common.core.web.domain.AjaxResult; + +/** + * 验证码处理 + * + * @author ruoyi + */ +public interface ValidateCodeService +{ + /** + * 生成验证码 + */ + public AjaxResult createCaptcha() throws IOException, CaptchaException; + + /** + * 校验验证码 + */ + public void checkCaptcha(String key, String value) throws CaptchaException; +} diff --git a/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/impl/ValidateCodeServiceImpl.java b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/impl/ValidateCodeServiceImpl.java new file mode 100644 index 0000000..36c3a8e --- /dev/null +++ b/zeroerroa-gateway/src/main/java/com/zeroerr/gateway/service/impl/ValidateCodeServiceImpl.java @@ -0,0 +1,118 @@ +package com.zeroerr.gateway.service.impl; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.FastByteArrayOutputStream; +import com.google.code.kaptcha.Producer; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.exception.CaptchaException; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.sign.Base64; +import com.zeroerr.common.core.utils.uuid.IdUtils; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.gateway.config.properties.CaptchaProperties; +import com.zeroerr.gateway.service.ValidateCodeService; + +/** + * 验证码实现处理 + * + * @author ruoyi + */ +@Service +public class ValidateCodeServiceImpl implements ValidateCodeService +{ + @Resource(name = "captchaProducer") + private Producer captchaProducer; + + @Resource(name = "captchaProducerMath") + private Producer captchaProducerMath; + + @Autowired + private RedisService redisService; + + @Autowired + private CaptchaProperties captchaProperties; + + /** + * 生成验证码 + */ + @Override + public AjaxResult createCaptcha() throws IOException, CaptchaException + { + AjaxResult ajax = AjaxResult.success(); + boolean captchaEnabled = captchaProperties.getEnabled(); + ajax.put("captchaEnabled", captchaEnabled); + if (!captchaEnabled) + { + return ajax; + } + + // 保存验证码信息 + String uuid = IdUtils.simpleUUID(); + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + + String capStr = null, code = null; + BufferedImage image = null; + + String captchaType = captchaProperties.getType(); + // 生成验证码 + if ("math".equals(captchaType)) + { + String capText = captchaProducerMath.createText(); + capStr = capText.substring(0, capText.lastIndexOf("@")); + code = capText.substring(capText.lastIndexOf("@") + 1); + image = captchaProducerMath.createImage(capStr); + } + else if ("char".equals(captchaType)) + { + capStr = code = captchaProducer.createText(); + image = captchaProducer.createImage(capStr); + } + + redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); + // 转换流信息写出 + FastByteArrayOutputStream os = new FastByteArrayOutputStream(); + try + { + ImageIO.write(image, "jpg", os); + } + catch (IOException e) + { + return AjaxResult.error(e.getMessage()); + } + + ajax.put("uuid", uuid); + ajax.put("img", Base64.encode(os.toByteArray())); + return ajax; + } + + /** + * 校验验证码 + */ + @Override + public void checkCaptcha(String code, String uuid) throws CaptchaException + { + if (StringUtils.isEmpty(code)) + { + throw new CaptchaException("验证码不能为空"); + } + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisService.getCacheObject(verifyKey); + if (captcha == null) + { + throw new CaptchaException("验证码已失效"); + } + redisService.deleteObject(verifyKey); + if (!code.equalsIgnoreCase(captcha)) + { + throw new CaptchaException("验证码错误"); + } + } +} diff --git a/zeroerroa-gateway/src/main/resources/banner.txt b/zeroerroa-gateway/src/main/resources/banner.txt new file mode 100644 index 0000000..ceced29 --- /dev/null +++ b/zeroerroa-gateway/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ __ _ __ _ | |_ ___ __ __ __ _ _ _ +| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | | +| | | |_| || (_) || |_| || | | (_| || (_| || |_ | __/ \ V V / | (_| || |_| | +|_| \__,_| \___/ \__, ||_| \__, | \__,_| \__| \___| \_/\_/ \__,_| \__, | + __/ | __/ | __/ | + |___/ |___/ |___/ \ No newline at end of file diff --git a/zeroerroa-gateway/src/main/resources/bootstrap.yml b/zeroerroa-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..2cba486 --- /dev/null +++ b/zeroerroa-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,44 @@ +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-gateway + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + sentinel: + # 取消控制台懒加载 + eager: true + transport: + # 控制台地址 + dashboard: 127.0.0.1:8718 + # nacos配置持久化 + datasource: + ds1: + nacos: + server-addr: 192.168.1.105:8848 + dataId: sentinel-zeroerroa-gateway + groupId: DEFAULT_GROUP + data-type: json + rule-type: gw-flow diff --git a/zeroerroa-gateway/src/main/resources/logback.xml b/zeroerroa-gateway/src/main/resources/logback.xml new file mode 100644 index 0000000..748a7f6 --- /dev/null +++ b/zeroerroa-gateway/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-gateway/start.sh b/zeroerroa-gateway/start.sh new file mode 100644 index 0000000..332250d --- /dev/null +++ b/zeroerroa-gateway/start.sh @@ -0,0 +1,8 @@ +#!/bin/sh +java -Xms256m -Xmx256m -jar /drone/*.jar + +if [ $? != 0 ]; then + echo Failed to start java >&2 + exit 1 +fi + diff --git a/zeroerroa-modules/pom.xml b/zeroerroa-modules/pom.xml new file mode 100644 index 0000000..d38a3b0 --- /dev/null +++ b/zeroerroa-modules/pom.xml @@ -0,0 +1,26 @@ + + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + + zeroerroa-system + zeroerroa-gen + zeroerroa-job + zeroerroa-file + zeroerroa-recruit + + + zeroerroa-modules + pom + + + zeroerroa-modules业务模块 + + + diff --git a/zeroerroa-modules/zeroerroa-file/pom.xml b/zeroerroa-modules/zeroerroa-file/pom.xml new file mode 100644 index 0000000..2358c91 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/pom.xml @@ -0,0 +1,88 @@ + + + + com.zeroerr + zeroerroa-modules + 3.6.4 + + 4.0.0 + + zeroerroa-modules-file + + + zeroerroa-modules-file文件服务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.github.tobato + fastdfs-client + + + + + io.minio + minio + ${minio.version} + + + + + com.zeroerr + zeroerroa-api-system + + + + + com.zeroerr + zeroerroa-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/ZeroErrFileApplication.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/ZeroErrFileApplication.java new file mode 100644 index 0000000..c6c0818 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/ZeroErrFileApplication.java @@ -0,0 +1,31 @@ +package com.zeroerr.file; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import com.zeroerr.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 文件服务 + * + * @author ruoyi + */ +@EnableCustomSwagger2 +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class ZeroErrFileApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrFileApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 文件服务模块启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/MinioConfig.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/MinioConfig.java new file mode 100644 index 0000000..68b4a8d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/MinioConfig.java @@ -0,0 +1,82 @@ +package com.zeroerr.file.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import io.minio.MinioClient; + +/** + * Minio 配置信息 + * + * @author ruoyi + */ +@Configuration +@ConfigurationProperties(prefix = "minio") +public class MinioConfig +{ + /** + * 服务地址 + */ + private String url; + + /** + * 用户名 + */ + private String accessKey; + + /** + * 密码 + */ + private String secretKey; + + /** + * 存储桶名称 + */ + private String bucketName; + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + public String getAccessKey() + { + return accessKey; + } + + public void setAccessKey(String accessKey) + { + this.accessKey = accessKey; + } + + public String getSecretKey() + { + return secretKey; + } + + public void setSecretKey(String secretKey) + { + this.secretKey = secretKey; + } + + public String getBucketName() + { + return bucketName; + } + + public void setBucketName(String bucketName) + { + this.bucketName = bucketName; + } + + @Bean + public MinioClient getMinioClient() + { + return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build(); + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/ResourcesConfig.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/ResourcesConfig.java new file mode 100644 index 0000000..4c13d09 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/ResourcesConfig.java @@ -0,0 +1,50 @@ +package com.zeroerr.file.config; + +import java.io.File; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 通用映射配置 + * + * @author ruoyi + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 本地文件上传路径 */ + registry.addResourceHandler(localFilePrefix + "/**") + .addResourceLocations("file:" + localFilePath + File.separator); + } + + /** + * 开启跨域 + */ + @Override + public void addCorsMappings(CorsRegistry registry) { + // 设置允许跨域的路由 + registry.addMapping(localFilePrefix + "/**") + // 设置允许跨域请求的域名 + .allowedOrigins("*") + // 设置允许的方法 + .allowedMethods("GET"); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/RuoYiConfig.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/RuoYiConfig.java new file mode 100644 index 0000000..1711320 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/config/RuoYiConfig.java @@ -0,0 +1,122 @@ +package com.zeroerr.file.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 读取项目相关配置 + * + * @author ruoyi + */ +@Component +@ConfigurationProperties(prefix = "ruoyi") +public class RuoYiConfig +{ + /** 项目名称 */ + private String name; + + /** 版本 */ + private String version; + + /** 版权年份 */ + private String copyrightYear; + + /** 上传路径 */ + private static String profile; + + /** 获取地址开关 */ + private static boolean addressEnabled; + + /** 验证码类型 */ + private static String captchaType; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getCopyrightYear() + { + return copyrightYear; + } + + public void setCopyrightYear(String copyrightYear) + { + this.copyrightYear = copyrightYear; + } + + public static String getProfile() + { + return profile; + } + + public void setProfile(String profile) + { + RuoYiConfig.profile = profile; + } + + public static boolean isAddressEnabled() + { + return addressEnabled; + } + + public void setAddressEnabled(boolean addressEnabled) + { + RuoYiConfig.addressEnabled = addressEnabled; + } + + public static String getCaptchaType() { + return captchaType; + } + + public void setCaptchaType(String captchaType) { + RuoYiConfig.captchaType = captchaType; + } + + /** + * 获取导入上传路径 + */ + public static String getImportPath() + { + return getProfile() + "/import"; + } + + /** + * 获取头像上传路径 + */ + public static String getAvatarPath() + { + return getProfile() + "/avatar"; + } + + /** + * 获取下载路径 + */ + public static String getDownloadPath() + { + return getProfile() + "/download/"; + } + + /** + * 获取上传路径 + */ + public static String getUploadPath() + { + return getProfile() + "/upload"; + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/controller/SysFileController.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/controller/SysFileController.java new file mode 100644 index 0000000..2e511a2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/controller/SysFileController.java @@ -0,0 +1,48 @@ +package com.zeroerr.file.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.utils.file.FileUtils; +import com.zeroerr.file.service.ISysFileService; +import com.zeroerr.system.api.domain.SysFile; + +/** + * 文件请求处理 + * + * @author ruoyi + */ +@RestController +public class SysFileController +{ + private static final Logger log = LoggerFactory.getLogger(SysFileController.class); + + @Autowired + private ISysFileService sysFileService; + + /** + * 文件上传请求 + */ + @PostMapping("upload") + public R upload(MultipartFile file) + { + try + { + // 上传并返回访问地址 + String url = sysFileService.uploadFile(file); + SysFile sysFile = new SysFile(); + sysFile.setName(FileUtils.getName(url)); + sysFile.setUrl(url); + return R.ok(sysFile); + } + catch (Exception e) + { + log.error("上传文件失败", e); + return R.fail(e.getMessage()); + } + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/FastDfsSysFileServiceImpl.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/FastDfsSysFileServiceImpl.java new file mode 100644 index 0000000..651ca4f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/FastDfsSysFileServiceImpl.java @@ -0,0 +1,46 @@ +package com.zeroerr.file.service; + +import java.io.InputStream; +import com.alibaba.nacos.common.utils.IoUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import com.zeroerr.common.core.utils.file.FileTypeUtils; + +/** + * FastDFS 文件存储 + * + * @author ruoyi + */ +@Service +public class FastDfsSysFileServiceImpl implements ISysFileService +{ + /** + * 域名或本机访问地址 + */ + @Value("${fdfs.domain}") + public String domain; + + @Autowired + private FastFileStorageClient storageClient; + + /** + * FastDfs文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + InputStream inputStream = file.getInputStream(); + StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), + FileTypeUtils.getExtension(file), null); + IoUtils.closeQuietly(inputStream); + return domain + "/" + storePath.getFullPath(); + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/ISysFileService.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/ISysFileService.java new file mode 100644 index 0000000..afdf335 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/ISysFileService.java @@ -0,0 +1,20 @@ +package com.zeroerr.file.service; + +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件上传接口 + * + * @author ruoyi + */ +public interface ISysFileService +{ + /** + * 文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + public String uploadFile(MultipartFile file) throws Exception; +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/LocalSysFileServiceImpl.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/LocalSysFileServiceImpl.java new file mode 100644 index 0000000..1f23714 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/LocalSysFileServiceImpl.java @@ -0,0 +1,50 @@ +package com.zeroerr.file.service; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.file.utils.FileUploadUtils; + +/** + * 本地文件存储 + * + * @author ruoyi + */ +@Primary +@Service +public class LocalSysFileServiceImpl implements ISysFileService +{ + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + + /** + * 域名或本机访问地址 + */ + @Value("${file.domain}") + public String domain; + + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + /** + * 本地文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String name = FileUploadUtils.upload(localFilePath, file); + String url = domain + localFilePrefix + name; + return url; + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/MinioSysFileServiceImpl.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/MinioSysFileServiceImpl.java new file mode 100644 index 0000000..8f61ee7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/service/MinioSysFileServiceImpl.java @@ -0,0 +1,49 @@ +package com.zeroerr.file.service; + +import java.io.InputStream; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import com.alibaba.nacos.common.utils.IoUtils; +import com.zeroerr.file.config.MinioConfig; +import com.zeroerr.file.utils.FileUploadUtils; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; + +/** + * Minio 文件存储 + * + * @author ruoyi + */ +@Service +public class MinioSysFileServiceImpl implements ISysFileService +{ + @Autowired + private MinioConfig minioConfig; + + @Autowired + private MinioClient client; + + /** + * Minio文件上传接口 + * + * @param file 上传的文件 + * @return 访问地址 + * @throws Exception + */ + @Override + public String uploadFile(MultipartFile file) throws Exception + { + String fileName = FileUploadUtils.extractFilename(file); + InputStream inputStream = file.getInputStream(); + PutObjectArgs args = PutObjectArgs.builder() + .bucket(minioConfig.getBucketName()) + .object(fileName) + .stream(inputStream, file.getSize(), -1) + .contentType(file.getContentType()) + .build(); + client.putObject(args); + IoUtils.closeQuietly(inputStream); + return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; + } +} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/utils/FileUploadUtils.java b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/utils/FileUploadUtils.java new file mode 100644 index 0000000..a81cf8a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/java/com/zeroerr/file/utils/FileUploadUtils.java @@ -0,0 +1,185 @@ +package com.zeroerr.file.utils; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.exception.file.FileException; +import com.zeroerr.common.core.exception.file.FileNameLengthLimitExceededException; +import com.zeroerr.common.core.exception.file.FileSizeLimitExceededException; +import com.zeroerr.common.core.exception.file.InvalidExtensionException; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.file.FileTypeUtils; +import com.zeroerr.common.core.utils.file.MimeTypeUtils; +import com.zeroerr.common.core.utils.uuid.Seq; + +/** + * 文件上传工具类 + * + * @author ruoyi + */ +public class FileUploadUtils +{ + /** + * 默认大小 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; + + /** + * 默认的文件名最大长度 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 根据文件路径上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @return 文件名称 + * @throws IOException + */ + public static final String upload(String baseDir, MultipartFile file) throws IOException + { + try + { + return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (FileException fe) + { + throw new IOException(fe.getDefaultMessage(), fe); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 文件上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @param allowedExtension 上传文件类型 + * @return 返回上传成功的文件名 + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws FileNameLengthLimitExceededException 文件名太长 + * @throws IOException 比如读写文件出错时 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, + InvalidExtensionException + { + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) + { + throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); + } + + assertAllowed(file, allowedExtension); + + String fileName = extractFilename(file); + + String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); + file.transferTo(Paths.get(absPath)); + return getPathFileName(fileName); + } + + /** + * 编码文件名 + */ + public static final String extractFilename(MultipartFile file) + { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); + } + + private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException + { + File desc = new File(uploadDir + File.separator + fileName); + + if (!desc.exists()) + { + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + } + return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); + } + + private static final String getPathFileName(String fileName) throws IOException + { + String pathFileName = "/" + fileName; + return pathFileName; + } + + /** + * 文件大小校验 + * + * @param file 上传的文件 + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException + { + long size = file.getSize(); + if (size > DEFAULT_MAX_SIZE) + { + throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); + } + + String fileName = file.getOriginalFilename(); + String extension = FileTypeUtils.getExtension(file); + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) + { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) + { + throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) + { + throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) + { + throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) + { + throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, + fileName); + } + else + { + throw new InvalidExtensionException(allowedExtension, extension, fileName); + } + } + } + + /** + * 判断MIME类型是否是允许的MIME类型 + * + * @param extension 上传文件类型 + * @param allowedExtension 允许上传文件类型 + * @return true/false + */ + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) + { + for (String str : allowedExtension) + { + if (str.equalsIgnoreCase(extension)) + { + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-file/src/main/resources/banner.txt b/zeroerroa-modules/zeroerroa-file/src/main/resources/banner.txt new file mode 100644 index 0000000..27cacb9 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ __ _ _ + (_) / _|(_)| | + _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ +| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ +| | | |_| || (_) || |_| || | | | | || || __/ +|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| + __/ | + |___/ \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-file/src/main/resources/bootstrap.yml b/zeroerroa-modules/zeroerroa-file/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..faa5f9e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9300 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-file + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-modules/zeroerroa-file/src/main/resources/logback.xml b/zeroerroa-modules/zeroerroa-file/src/main/resources/logback.xml new file mode 100644 index 0000000..6f24166 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-file/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/pom.xml b/zeroerroa-modules/zeroerroa-gen/pom.xml new file mode 100644 index 0000000..cddc991 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/pom.xml @@ -0,0 +1,94 @@ + + + + com.zeroerr + zeroerroa-modules + 3.6.4 + + 4.0.0 + + zeroerroa-modules-gen + + + zeroerroa-modules-gen代码生成 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.apache.velocity + velocity-engine-core + + + + + com.mysql + mysql-connector-j + + + + + com.zeroerr + zeroerroa-common-log + + + + + com.zeroerr + zeroerroa-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/ZeroErrGenApplication.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/ZeroErrGenApplication.java new file mode 100644 index 0000000..5111520 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/ZeroErrGenApplication.java @@ -0,0 +1,34 @@ +package com.zeroerr.gen; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.zeroerr.common.security.annotation.EnableCustomConfig; +import com.zeroerr.common.security.annotation.EnableRyFeignClients; +import com.zeroerr.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 代码生成 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZeroErrGenApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrGenApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 代码生成模块启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/config/GenConfig.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/config/GenConfig.java new file mode 100644 index 0000000..6c5e1f1 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/config/GenConfig.java @@ -0,0 +1,66 @@ +package com.zeroerr.gen.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 代码生成相关配置 + * + * @author ruoyi + */ +@Component +@ConfigurationProperties(prefix = "gen") +public class GenConfig +{ + /** 作者 */ + public static String author; + + /** 生成包路径 */ + public static String packageName; + + /** 自动去除表前缀,默认是false */ + public static boolean autoRemovePre; + + /** 表前缀(类名不会包含表前缀) */ + public static String tablePrefix; + + public static String getAuthor() + { + return author; + } + + public void setAuthor(String author) + { + GenConfig.author = author; + } + + public static String getPackageName() + { + return packageName; + } + + public void setPackageName(String packageName) + { + GenConfig.packageName = packageName; + } + + public static boolean getAutoRemovePre() + { + return autoRemovePre; + } + + public void setAutoRemovePre(boolean autoRemovePre) + { + GenConfig.autoRemovePre = autoRemovePre; + } + + public static String getTablePrefix() + { + return tablePrefix; + } + + public void setTablePrefix(String tablePrefix) + { + GenConfig.tablePrefix = tablePrefix; + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/controller/GenController.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/controller/GenController.java new file mode 100644 index 0000000..978559c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/controller/GenController.java @@ -0,0 +1,211 @@ +package com.zeroerr.gen.controller; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.gen.domain.GenTable; +import com.zeroerr.gen.domain.GenTableColumn; +import com.zeroerr.gen.service.IGenTableColumnService; +import com.zeroerr.gen.service.IGenTableService; + +/** + * 代码生成 操作处理 + * + * @author ruoyi + */ +@RequestMapping("/gen") +@RestController +public class GenController extends BaseController +{ + @Autowired + private IGenTableService genTableService; + + @Autowired + private IGenTableColumnService genTableColumnService; + + /** + * 查询代码生成列表 + */ + @RequiresPermissions("tool:gen:list") + @GetMapping("/list") + public TableDataInfo genList(GenTable genTable) + { + startPage(); + List list = genTableService.selectGenTableList(genTable); + return getDataTable(list); + } + + /** + * 修改代码生成业务 + */ + @RequiresPermissions("tool:gen:query") + @GetMapping(value = "/{tableId}") + public AjaxResult getInfo(@PathVariable Long tableId) + { + GenTable table = genTableService.selectGenTableById(tableId); + List tables = genTableService.selectGenTableAll(); + List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); + Map map = new HashMap(); + map.put("info", table); + map.put("rows", list); + map.put("tables", tables); + return success(map); + } + + /** + * 查询数据库列表 + */ + @RequiresPermissions("tool:gen:list") + @GetMapping("/db/list") + public TableDataInfo dataList(GenTable genTable) + { + startPage(); + List list = genTableService.selectDbTableList(genTable); + return getDataTable(list); + } + + /** + * 查询数据表字段列表 + */ + @GetMapping(value = "/column/{tableId}") + public TableDataInfo columnList(Long tableId) + { + TableDataInfo dataInfo = new TableDataInfo(); + List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); + dataInfo.setRows(list); + dataInfo.setTotal(list.size()); + return dataInfo; + } + + /** + * 导入表结构(保存) + */ + @RequiresPermissions("tool:gen:import") + @Log(title = "代码生成", businessType = BusinessType.IMPORT) + @PostMapping("/importTable") + public AjaxResult importTableSave(String tables) + { + String[] tableNames = Convert.toStrArray(tables); + // 查询表信息 + List tableList = genTableService.selectDbTableListByNames(tableNames); + genTableService.importGenTable(tableList); + return success(); + } + + /** + * 修改保存代码生成业务 + */ + @RequiresPermissions("tool:gen:edit") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult editSave(@Validated @RequestBody GenTable genTable) + { + genTableService.validateEdit(genTable); + genTableService.updateGenTable(genTable); + return success(); + } + + /** + * 删除代码生成 + */ + @RequiresPermissions("tool:gen:remove") + @Log(title = "代码生成", businessType = BusinessType.DELETE) + @DeleteMapping("/{tableIds}") + public AjaxResult remove(@PathVariable Long[] tableIds) + { + genTableService.deleteGenTableByIds(tableIds); + return success(); + } + + /** + * 预览代码 + */ + @RequiresPermissions("tool:gen:preview") + @GetMapping("/preview/{tableId}") + public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException + { + Map dataMap = genTableService.previewCode(tableId); + return success(dataMap); + } + + /** + * 生成代码(下载方式) + */ + @RequiresPermissions("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/download/{tableName}") + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException + { + byte[] data = genTableService.downloadCode(tableName); + genCode(response, data); + } + + /** + * 生成代码(自定义路径) + */ + @RequiresPermissions("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/genCode/{tableName}") + public AjaxResult genCode(@PathVariable("tableName") String tableName) + { + genTableService.generatorCode(tableName); + return success(); + } + + /** + * 同步数据库 + */ + @RequiresPermissions("tool:gen:edit") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @GetMapping("/synchDb/{tableName}") + public AjaxResult synchDb(@PathVariable("tableName") String tableName) + { + genTableService.synchDb(tableName); + return success(); + } + + /** + * 批量生成代码 + */ + @RequiresPermissions("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/batchGenCode") + public void batchGenCode(HttpServletResponse response, String tables) throws IOException + { + String[] tableNames = Convert.toStrArray(tables); + byte[] data = genTableService.downloadCode(tableNames); + genCode(response, data); + } + + /** + * 生成zip文件 + */ + private void genCode(HttpServletResponse response, byte[] data) throws IOException + { + response.reset(); + response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + IOUtils.write(data, response.getOutputStream()); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTable.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTable.java new file mode 100644 index 0000000..afaf769 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTable.java @@ -0,0 +1,383 @@ +package com.zeroerr.gen.domain; + +import java.util.List; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import org.apache.commons.lang3.ArrayUtils; +import com.zeroerr.common.core.constant.GenConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 业务表 gen_table + * + * @author ruoyi + */ +public class GenTable extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long tableId; + + /** 表名称 */ + @NotBlank(message = "表名称不能为空") + private String tableName; + + /** 表描述 */ + @NotBlank(message = "表描述不能为空") + private String tableComment; + + /** 关联父表的表名 */ + private String subTableName; + + /** 本表关联父表的外键名 */ + private String subTableFkName; + + /** 实体类名称(首字母大写) */ + @NotBlank(message = "实体类名称不能为空") + private String className; + + /** 使用的模板(crud单表操作 tree树表操作 sub主子表操作) */ + private String tplCategory; + + /** 前端类型(element-ui模版 element-plus模版) */ + private String tplWebType; + + /** 生成包路径 */ + @NotBlank(message = "生成包路径不能为空") + private String packageName; + + /** 生成模块名 */ + @NotBlank(message = "生成模块名不能为空") + private String moduleName; + + /** 生成业务名 */ + @NotBlank(message = "生成业务名不能为空") + private String businessName; + + /** 生成功能名 */ + @NotBlank(message = "生成功能名不能为空") + private String functionName; + + /** 生成作者 */ + @NotBlank(message = "作者不能为空") + private String functionAuthor; + + /** 生成代码方式(0zip压缩包 1自定义路径) */ + private String genType; + + /** 生成路径(不填默认项目路径) */ + private String genPath; + + /** 主键信息 */ + private GenTableColumn pkColumn; + + /** 子表信息 */ + private GenTable subTable; + + /** 表列信息 */ + @Valid + private List columns; + + /** 其它生成选项 */ + private String options; + + /** 树编码字段 */ + private String treeCode; + + /** 树父编码字段 */ + private String treeParentCode; + + /** 树名称字段 */ + private String treeName; + + /** 上级菜单ID字段 */ + private String parentMenuId; + + /** 上级菜单名称字段 */ + private String parentMenuName; + + public Long getTableId() + { + return tableId; + } + + public void setTableId(Long tableId) + { + this.tableId = tableId; + } + + public String getTableName() + { + return tableName; + } + + public void setTableName(String tableName) + { + this.tableName = tableName; + } + + public String getTableComment() + { + return tableComment; + } + + public void setTableComment(String tableComment) + { + this.tableComment = tableComment; + } + + public String getSubTableName() + { + return subTableName; + } + + public void setSubTableName(String subTableName) + { + this.subTableName = subTableName; + } + + public String getSubTableFkName() + { + return subTableFkName; + } + + public void setSubTableFkName(String subTableFkName) + { + this.subTableFkName = subTableFkName; + } + + public String getClassName() + { + return className; + } + + public void setClassName(String className) + { + this.className = className; + } + + public String getTplCategory() + { + return tplCategory; + } + + public void setTplCategory(String tplCategory) + { + this.tplCategory = tplCategory; + } + + public String getTplWebType() + { + return tplWebType; + } + + public void setTplWebType(String tplWebType) + { + this.tplWebType = tplWebType; + } + + public String getPackageName() + { + return packageName; + } + + public void setPackageName(String packageName) + { + this.packageName = packageName; + } + + public String getModuleName() + { + return moduleName; + } + + public void setModuleName(String moduleName) + { + this.moduleName = moduleName; + } + + public String getBusinessName() + { + return businessName; + } + + public void setBusinessName(String businessName) + { + this.businessName = businessName; + } + + public String getFunctionName() + { + return functionName; + } + + public void setFunctionName(String functionName) + { + this.functionName = functionName; + } + + public String getFunctionAuthor() + { + return functionAuthor; + } + + public void setFunctionAuthor(String functionAuthor) + { + this.functionAuthor = functionAuthor; + } + + public String getGenType() + { + return genType; + } + + public void setGenType(String genType) + { + this.genType = genType; + } + + public String getGenPath() + { + return genPath; + } + + public void setGenPath(String genPath) + { + this.genPath = genPath; + } + + public GenTableColumn getPkColumn() + { + return pkColumn; + } + + public void setPkColumn(GenTableColumn pkColumn) + { + this.pkColumn = pkColumn; + } + + public GenTable getSubTable() + { + return subTable; + } + + public void setSubTable(GenTable subTable) + { + this.subTable = subTable; + } + public List getColumns() + { + return columns; + } + + public void setColumns(List columns) + { + this.columns = columns; + } + + public String getOptions() + { + return options; + } + + public void setOptions(String options) + { + this.options = options; + } + + public String getTreeCode() + { + return treeCode; + } + + public void setTreeCode(String treeCode) + { + this.treeCode = treeCode; + } + + public String getTreeParentCode() + { + return treeParentCode; + } + + public void setTreeParentCode(String treeParentCode) + { + this.treeParentCode = treeParentCode; + } + + public String getTreeName() + { + return treeName; + } + + public void setTreeName(String treeName) + { + this.treeName = treeName; + } + + public String getParentMenuId() + { + return parentMenuId; + } + + public void setParentMenuId(String parentMenuId) + { + this.parentMenuId = parentMenuId; + } + + public String getParentMenuName() + { + return parentMenuName; + } + + public void setParentMenuName(String parentMenuName) + { + this.parentMenuName = parentMenuName; + } + + public boolean isSub() + { + return isSub(this.tplCategory); + } + + public static boolean isSub(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); + } + public boolean isTree() + { + return isTree(this.tplCategory); + } + + public static boolean isTree(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); + } + + public boolean isCrud() + { + return isCrud(this.tplCategory); + } + + public static boolean isCrud(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); + } + + public boolean isSuperColumn(String javaField) + { + return isSuperColumn(this.tplCategory, javaField); + } + + public static boolean isSuperColumn(String tplCategory, String javaField) + { + if (isTree(tplCategory)) + { + return StringUtils.equalsAnyIgnoreCase(javaField, + ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); + } + return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTableColumn.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTableColumn.java new file mode 100644 index 0000000..3ec189f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/domain/GenTableColumn.java @@ -0,0 +1,374 @@ +package com.zeroerr.gen.domain; + +import javax.validation.constraints.NotBlank; + +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 代码生成业务字段表 gen_table_column + * + * @author ruoyi + */ +public class GenTableColumn extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long columnId; + + /** 归属表编号 */ + private Long tableId; + + /** 列名称 */ + private String columnName; + + /** 列描述 */ + private String columnComment; + + /** 列类型 */ + private String columnType; + + /** JAVA类型 */ + private String javaType; + + /** JAVA字段名 */ + @NotBlank(message = "Java属性不能为空") + private String javaField; + + /** 是否主键(1是) */ + private String isPk; + + /** 是否自增(1是) */ + private String isIncrement; + + /** 是否必填(1是) */ + private String isRequired; + + /** 是否为插入字段(1是) */ + private String isInsert; + + /** 是否编辑字段(1是) */ + private String isEdit; + + /** 是否列表字段(1是) */ + private String isList; + + /** 是否查询字段(1是) */ + private String isQuery; + + /** 查询方式(EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围) */ + private String queryType; + + /** 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件) */ + private String htmlType; + + /** 字典类型 */ + private String dictType; + + /** 排序 */ + private Integer sort; + + public void setColumnId(Long columnId) + { + this.columnId = columnId; + } + + public Long getColumnId() + { + return columnId; + } + + public void setTableId(Long tableId) + { + this.tableId = tableId; + } + + public Long getTableId() + { + return tableId; + } + + public void setColumnName(String columnName) + { + this.columnName = columnName; + } + + public String getColumnName() + { + return columnName; + } + + public void setColumnComment(String columnComment) + { + this.columnComment = columnComment; + } + + public String getColumnComment() + { + return columnComment; + } + + public void setColumnType(String columnType) + { + this.columnType = columnType; + } + + public String getColumnType() + { + return columnType; + } + + public void setJavaType(String javaType) + { + this.javaType = javaType; + } + + public String getJavaType() + { + return javaType; + } + + public void setJavaField(String javaField) + { + this.javaField = javaField; + } + + public String getJavaField() + { + return javaField; + } + + public String getCapJavaField() + { + return StringUtils.capitalize(javaField); + } + + public void setIsPk(String isPk) + { + this.isPk = isPk; + } + + public String getIsPk() + { + return isPk; + } + + public boolean isPk() + { + return isPk(this.isPk); + } + + public boolean isPk(String isPk) + { + return isPk != null && StringUtils.equals("1", isPk); + } + + public String getIsIncrement() + { + return isIncrement; + } + + public void setIsIncrement(String isIncrement) + { + this.isIncrement = isIncrement; + } + + public boolean isIncrement() + { + return isIncrement(this.isIncrement); + } + + public boolean isIncrement(String isIncrement) + { + return isIncrement != null && StringUtils.equals("1", isIncrement); + } + + public void setIsRequired(String isRequired) + { + this.isRequired = isRequired; + } + + public String getIsRequired() + { + return isRequired; + } + + public boolean isRequired() + { + return isRequired(this.isRequired); + } + + public boolean isRequired(String isRequired) + { + return isRequired != null && StringUtils.equals("1", isRequired); + } + + public void setIsInsert(String isInsert) + { + this.isInsert = isInsert; + } + + public String getIsInsert() + { + return isInsert; + } + + public boolean isInsert() + { + return isInsert(this.isInsert); + } + + public boolean isInsert(String isInsert) + { + return isInsert != null && StringUtils.equals("1", isInsert); + } + + public void setIsEdit(String isEdit) + { + this.isEdit = isEdit; + } + + public String getIsEdit() + { + return isEdit; + } + + public boolean isEdit() + { + return isInsert(this.isEdit); + } + + public boolean isEdit(String isEdit) + { + return isEdit != null && StringUtils.equals("1", isEdit); + } + + public void setIsList(String isList) + { + this.isList = isList; + } + + public String getIsList() + { + return isList; + } + + public boolean isList() + { + return isList(this.isList); + } + + public boolean isList(String isList) + { + return isList != null && StringUtils.equals("1", isList); + } + + public void setIsQuery(String isQuery) + { + this.isQuery = isQuery; + } + + public String getIsQuery() + { + return isQuery; + } + + public boolean isQuery() + { + return isQuery(this.isQuery); + } + + public boolean isQuery(String isQuery) + { + return isQuery != null && StringUtils.equals("1", isQuery); + } + + public void setQueryType(String queryType) + { + this.queryType = queryType; + } + + public String getQueryType() + { + return queryType; + } + + public String getHtmlType() + { + return htmlType; + } + + public void setHtmlType(String htmlType) + { + this.htmlType = htmlType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getDictType() + { + return dictType; + } + + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + + public boolean isSuperColumn() + { + return isSuperColumn(this.javaField); + } + + public static boolean isSuperColumn(String javaField) + { + return StringUtils.equalsAnyIgnoreCase(javaField, + // BaseEntity + "createBy", "createTime", "updateBy", "updateTime", "remark", + // TreeEntity + "parentName", "parentId", "orderNum", "ancestors"); + } + + public boolean isUsableColumn() + { + return isUsableColumn(javaField); + } + + public static boolean isUsableColumn(String javaField) + { + // isSuperColumn()中的名单用于避免生成多余Domain属性,若某些属性在生成页面时需要用到不能忽略,则放在此处白名单 + return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); + } + + public String readConverterExp() + { + String remarks = StringUtils.substringBetween(this.columnComment, "(", ")"); + StringBuffer sb = new StringBuffer(); + if (StringUtils.isNotEmpty(remarks)) + { + for (String value : remarks.split(" ")) + { + if (StringUtils.isNotEmpty(value)) + { + Object startStr = value.subSequence(0, 1); + String endStr = value.substring(1); + sb.append("").append(startStr).append("=").append(endStr).append(","); + } + } + return sb.deleteCharAt(sb.length() - 1).toString(); + } + else + { + return this.columnComment; + } + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableColumnMapper.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableColumnMapper.java new file mode 100644 index 0000000..d7a8e2a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableColumnMapper.java @@ -0,0 +1,62 @@ +package com.zeroerr.gen.mapper; + +import java.util.List; +import com.zeroerr.gen.domain.GenTableColumn; +import org.springframework.stereotype.Repository; + +/** + * 业务字段 数据层 + * + * @author ruoyi + */ +@Repository +public interface GenTableColumnMapper +{ + /** + * 根据表名称查询列信息 + * + * @param tableName 表名称 + * @return 列信息 + */ + public List selectDbTableColumnsByName(String tableName); + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + public List selectGenTableColumnListByTableId(Long tableId); + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int insertGenTableColumn(GenTableColumn genTableColumn); + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int updateGenTableColumn(GenTableColumn genTableColumn); + + /** + * 删除业务字段 + * + * @param genTableColumns 列数据 + * @return 结果 + */ + public int deleteGenTableColumns(List genTableColumns); + + /** + * 批量删除业务字段 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableColumnByIds(Long[] ids); +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableMapper.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableMapper.java new file mode 100644 index 0000000..90f80ac --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/mapper/GenTableMapper.java @@ -0,0 +1,85 @@ +package com.zeroerr.gen.mapper; + +import java.util.List; +import com.zeroerr.gen.domain.GenTable; +import org.springframework.stereotype.Repository; + +/** + * 业务 数据层 + * + * @author ruoyi + */ +@Repository +public interface GenTableMapper +{ + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + public List selectGenTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + public List selectDbTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + public List selectDbTableListByNames(String[] tableNames); + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + public List selectGenTableAll(); + + /** + * 查询表ID业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + public GenTable selectGenTableById(Long id); + + /** + * 查询表名称业务信息 + * + * @param tableName 表名称 + * @return 业务信息 + */ + public GenTable selectGenTableByName(String tableName); + + /** + * 新增业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public int insertGenTable(GenTable genTable); + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public int updateGenTable(GenTable genTable); + + /** + * 批量删除业务 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableByIds(Long[] ids); +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableColumnServiceImpl.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableColumnServiceImpl.java new file mode 100644 index 0000000..157ede8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableColumnServiceImpl.java @@ -0,0 +1,68 @@ +package com.zeroerr.gen.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.gen.domain.GenTableColumn; +import com.zeroerr.gen.mapper.GenTableColumnMapper; + +/** + * 业务字段 服务层实现 + * + * @author ruoyi + */ +@Service +public class GenTableColumnServiceImpl implements IGenTableColumnService +{ + @Autowired + private GenTableColumnMapper genTableColumnMapper; + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + @Override + public List selectGenTableColumnListByTableId(Long tableId) + { + return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); + } + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + @Override + public int insertGenTableColumn(GenTableColumn genTableColumn) + { + return genTableColumnMapper.insertGenTableColumn(genTableColumn); + } + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + @Override + public int updateGenTableColumn(GenTableColumn genTableColumn) + { + return genTableColumnMapper.updateGenTableColumn(genTableColumn); + } + + /** + * 删除业务字段对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteGenTableColumnByIds(String ids) + { + return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableServiceImpl.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableServiceImpl.java new file mode 100644 index 0000000..d283dae --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/GenTableServiceImpl.java @@ -0,0 +1,521 @@ +package com.zeroerr.gen.service; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.constant.GenConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.text.CharsetKit; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.gen.domain.GenTable; +import com.zeroerr.gen.domain.GenTableColumn; +import com.zeroerr.gen.mapper.GenTableColumnMapper; +import com.zeroerr.gen.mapper.GenTableMapper; +import com.zeroerr.gen.util.GenUtils; +import com.zeroerr.gen.util.VelocityInitializer; +import com.zeroerr.gen.util.VelocityUtils; + +/** + * 业务 服务层实现 + * + * @author ruoyi + */ +@Service +public class GenTableServiceImpl implements IGenTableService +{ + private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); + + @Autowired + private GenTableMapper genTableMapper; + + @Autowired + private GenTableColumnMapper genTableColumnMapper; + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + @Override + public GenTable selectGenTableById(Long id) + { + GenTable genTable = genTableMapper.selectGenTableById(id); + setTableFromOptions(genTable); + return genTable; + } + + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + @Override + public List selectGenTableList(GenTable genTable) + { + return genTableMapper.selectGenTableList(genTable); + } + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + @Override + public List selectDbTableList(GenTable genTable) + { + return genTableMapper.selectDbTableList(genTable); + } + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + @Override + public List selectDbTableListByNames(String[] tableNames) + { + return genTableMapper.selectDbTableListByNames(tableNames); + } + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + @Override + public List selectGenTableAll() + { + return genTableMapper.selectGenTableAll(); + } + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void updateGenTable(GenTable genTable) + { + String options = JSON.toJSONString(genTable.getParams()); + genTable.setOptions(options); + int row = genTableMapper.updateGenTable(genTable); + if (row > 0) + { + for (GenTableColumn cenTableColumn : genTable.getColumns()) + { + genTableColumnMapper.updateGenTableColumn(cenTableColumn); + } + } + } + + /** + * 删除业务对象 + * + * @param tableIds 需要删除的数据ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteGenTableByIds(Long[] tableIds) + { + genTableMapper.deleteGenTableByIds(tableIds); + genTableColumnMapper.deleteGenTableColumnByIds(tableIds); + } + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void importGenTable(List tableList) + { + String operName = SecurityUtils.getUsername(); + try + { + for (GenTable table : tableList) + { + String tableName = table.getTableName(); + GenUtils.initTable(table, operName); + int row = genTableMapper.insertGenTable(table); + if (row > 0) + { + // 保存列信息 + List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); + for (GenTableColumn column : genTableColumns) + { + GenUtils.initColumnField(column, table); + genTableColumnMapper.insertGenTableColumn(column); + } + } + } + } + catch (Exception e) + { + throw new ServiceException("导入失败:" + e.getMessage()); + } + } + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + @Override + public Map previewCode(Long tableId) + { + Map dataMap = new LinkedHashMap<>(); + // 查询表信息 + GenTable table = genTableMapper.selectGenTableById(tableId); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType()); + for (String template : templates) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + dataMap.put(template, sw.toString()); + } + return dataMap; + } + + /** + * 生成代码(下载方式) + * + * @param tableName 表名称 + * @return 数据 + */ + @Override + public byte[] downloadCode(String tableName) + { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + generatorCode(tableName, zip); + IOUtils.closeQuietly(zip); + return outputStream.toByteArray(); + } + + /** + * 生成代码(自定义路径) + * + * @param tableName 表名称 + */ + @Override + public void generatorCode(String tableName) + { + // 查询表信息 + GenTable table = genTableMapper.selectGenTableByName(tableName); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType()); + for (String template : templates) + { + if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try + { + String path = getGenPath(table, template); + FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); + } + catch (IOException e) + { + throw new ServiceException("渲染模板失败,表名:" + table.getTableName()); + } + } + } + } + + /** + * 同步数据库 + * + * @param tableName 表名称 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void synchDb(String tableName) + { + GenTable table = genTableMapper.selectGenTableByName(tableName); + List tableColumns = table.getColumns(); + Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); + + List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); + if (StringUtils.isEmpty(dbTableColumns)) + { + throw new ServiceException("同步数据失败,原表结构不存在"); + } + List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); + + dbTableColumns.forEach(column -> { + GenUtils.initColumnField(column, table); + if (tableColumnMap.containsKey(column.getColumnName())) + { + GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); + column.setColumnId(prevColumn.getColumnId()); + if (column.isList()) + { + // 如果是列表,继续保留查询方式/字典类型选项 + column.setDictType(prevColumn.getDictType()); + column.setQueryType(prevColumn.getQueryType()); + } + if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() + && (column.isInsert() || column.isEdit()) + && ((column.isUsableColumn()) || (!column.isSuperColumn()))) + { + // 如果是(新增/修改&非主键/非忽略及父属性),继续保留必填/显示类型选项 + column.setIsRequired(prevColumn.getIsRequired()); + column.setHtmlType(prevColumn.getHtmlType()); + } + genTableColumnMapper.updateGenTableColumn(column); + } + else + { + genTableColumnMapper.insertGenTableColumn(column); + } + }); + + List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); + if (StringUtils.isNotEmpty(delColumns)) + { + genTableColumnMapper.deleteGenTableColumns(delColumns); + } + } + + /** + * 批量生成代码(下载方式) + * + * @param tableNames 表数组 + * @return 数据 + */ + @Override + public byte[] downloadCode(String[] tableNames) + { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + for (String tableName : tableNames) + { + generatorCode(tableName, zip); + } + IOUtils.closeQuietly(zip); + return outputStream.toByteArray(); + } + + /** + * 查询表信息并生成代码 + */ + private void generatorCode(String tableName, ZipOutputStream zip) + { + // 查询表信息 + GenTable table = genTableMapper.selectGenTableByName(tableName); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType()); + for (String template : templates) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try + { + // 添加到zip + zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); + IOUtils.write(sw.toString(), zip, Constants.UTF8); + IOUtils.closeQuietly(sw); + zip.flush(); + zip.closeEntry(); + } + catch (IOException e) + { + log.error("渲染模板失败,表名:" + table.getTableName(), e); + } + } + } + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + @Override + public void validateEdit(GenTable genTable) + { + if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) + { + String options = JSON.toJSONString(genTable.getParams()); + JSONObject paramsObj = JSON.parseObject(options); + if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) + { + throw new ServiceException("树编码字段不能为空"); + } + else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) + { + throw new ServiceException("树父编码字段不能为空"); + } + else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) + { + throw new ServiceException("树名称字段不能为空"); + } + else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) + { + if (StringUtils.isEmpty(genTable.getSubTableName())) + { + throw new ServiceException("关联子表的表名不能为空"); + } + else if (StringUtils.isEmpty(genTable.getSubTableFkName())) + { + throw new ServiceException("子表关联的外键名不能为空"); + } + } + } + } + + /** + * 设置主键列信息 + * + * @param table 业务表信息 + */ + public void setPkColumn(GenTable table) + { + for (GenTableColumn column : table.getColumns()) + { + if (column.isPk()) + { + table.setPkColumn(column); + break; + } + } + if (StringUtils.isNull(table.getPkColumn())) + { + table.setPkColumn(table.getColumns().get(0)); + } + if (GenConstants.TPL_SUB.equals(table.getTplCategory())) + { + for (GenTableColumn column : table.getSubTable().getColumns()) + { + if (column.isPk()) + { + table.getSubTable().setPkColumn(column); + break; + } + } + if (StringUtils.isNull(table.getSubTable().getPkColumn())) + { + table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); + } + } + } + + /** + * 设置主子表信息 + * + * @param table 业务表信息 + */ + public void setSubTable(GenTable table) + { + String subTableName = table.getSubTableName(); + if (StringUtils.isNotEmpty(subTableName)) + { + table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); + } + } + + /** + * 设置代码生成其他选项值 + * + * @param genTable 设置后的生成对象 + */ + public void setTableFromOptions(GenTable genTable) + { + JSONObject paramsObj = JSON.parseObject(genTable.getOptions()); + if (StringUtils.isNotNull(paramsObj)) + { + String treeCode = paramsObj.getString(GenConstants.TREE_CODE); + String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); + String treeName = paramsObj.getString(GenConstants.TREE_NAME); + String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID); + String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME); + + genTable.setTreeCode(treeCode); + genTable.setTreeParentCode(treeParentCode); + genTable.setTreeName(treeName); + genTable.setParentMenuId(parentMenuId); + genTable.setParentMenuName(parentMenuName); + } + } + + /** + * 获取代码生成地址 + * + * @param table 业务表信息 + * @param template 模板文件路径 + * @return 生成地址 + */ + public static String getGenPath(GenTable table, String template) + { + String genPath = table.getGenPath(); + if (StringUtils.equals(genPath, "/")) + { + return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); + } + return genPath + File.separator + VelocityUtils.getFileName(template, table); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableColumnService.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableColumnService.java new file mode 100644 index 0000000..fb68178 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableColumnService.java @@ -0,0 +1,44 @@ +package com.zeroerr.gen.service; + +import java.util.List; +import com.zeroerr.gen.domain.GenTableColumn; + +/** + * 业务字段 服务层 + * + * @author ruoyi + */ +public interface IGenTableColumnService +{ + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + public List selectGenTableColumnListByTableId(Long tableId); + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int insertGenTableColumn(GenTableColumn genTableColumn); + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int updateGenTableColumn(GenTableColumn genTableColumn); + + /** + * 删除业务字段信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableColumnByIds(String ids); +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableService.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableService.java new file mode 100644 index 0000000..c3df273 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/service/IGenTableService.java @@ -0,0 +1,121 @@ +package com.zeroerr.gen.service; + +import java.util.List; +import java.util.Map; +import com.zeroerr.gen.domain.GenTable; + +/** + * 业务 服务层 + * + * @author ruoyi + */ +public interface IGenTableService +{ + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + public List selectGenTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + public List selectDbTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + public List selectDbTableListByNames(String[] tableNames); + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + public List selectGenTableAll(); + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + public GenTable selectGenTableById(Long id); + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public void updateGenTable(GenTable genTable); + + /** + * 删除业务信息 + * + * @param tableIds 需要删除的表数据ID + * @return 结果 + */ + public void deleteGenTableByIds(Long[] tableIds); + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + */ + public void importGenTable(List tableList); + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + public Map previewCode(Long tableId); + + /** + * 生成代码(下载方式) + * + * @param tableName 表名称 + * @return 数据 + */ + public byte[] downloadCode(String tableName); + + /** + * 生成代码(自定义路径) + * + * @param tableName 表名称 + * @return 数据 + */ + public void generatorCode(String tableName); + + /** + * 同步数据库 + * + * @param tableName 表名称 + */ + public void synchDb(String tableName); + + /** + * 批量生成代码(下载方式) + * + * @param tableNames 表数组 + * @return 数据 + */ + public byte[] downloadCode(String[] tableNames); + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + public void validateEdit(GenTable genTable); +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/GenUtils.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/GenUtils.java new file mode 100644 index 0000000..b76f70b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/GenUtils.java @@ -0,0 +1,257 @@ +package com.zeroerr.gen.util; + +import java.util.Arrays; +import org.apache.commons.lang3.RegExUtils; +import com.zeroerr.common.core.constant.GenConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.gen.config.GenConfig; +import com.zeroerr.gen.domain.GenTable; +import com.zeroerr.gen.domain.GenTableColumn; + +/** + * 代码生成器 工具类 + * + * @author ruoyi + */ +public class GenUtils +{ + /** + * 初始化表信息 + */ + public static void initTable(GenTable genTable, String operName) + { + genTable.setClassName(convertClassName(genTable.getTableName())); + genTable.setPackageName(GenConfig.getPackageName()); + genTable.setModuleName(getModuleName(GenConfig.getPackageName())); + genTable.setBusinessName(getBusinessName(genTable.getTableName())); + genTable.setFunctionName(replaceText(genTable.getTableComment())); + genTable.setFunctionAuthor(GenConfig.getAuthor()); + genTable.setCreateBy(operName); + } + + /** + * 初始化列属性字段 + */ + public static void initColumnField(GenTableColumn column, GenTable table) + { + String dataType = getDbType(column.getColumnType()); + String columnName = column.getColumnName(); + column.setTableId(table.getTableId()); + column.setCreateBy(table.getCreateBy()); + // 设置java字段名 + column.setJavaField(StringUtils.toCamelCase(columnName)); + // 设置默认类型 + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + + if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) + { + // 字符串长度超过500设置为文本域 + Integer columnLength = getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); + } + else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) + { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } + else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) + { + column.setHtmlType(GenConstants.HTML_INPUT); + + // 如果是浮点型 统一用BigDecimal + String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) + { + column.setJavaType(GenConstants.TYPE_BIGDECIMAL); + } + // 如果是整形 + else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) + { + column.setJavaType(GenConstants.TYPE_INTEGER); + } + // 长整形 + else + { + column.setJavaType(GenConstants.TYPE_LONG); + } + } + + // 插入字段(默认所有字段都需要插入) + column.setIsInsert(GenConstants.REQUIRE); + + // 编辑字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) + { + column.setIsEdit(GenConstants.REQUIRE); + } + // 列表字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) + { + column.setIsList(GenConstants.REQUIRE); + } + // 查询字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) + { + column.setIsQuery(GenConstants.REQUIRE); + } + + // 查询字段类型 + if (StringUtils.endsWithIgnoreCase(columnName, "name")) + { + column.setQueryType(GenConstants.QUERY_LIKE); + } + // 状态字段设置单选框 + if (StringUtils.endsWithIgnoreCase(columnName, "status")) + { + column.setHtmlType(GenConstants.HTML_RADIO); + } + // 类型&性别字段设置下拉框 + else if (StringUtils.endsWithIgnoreCase(columnName, "type") + || StringUtils.endsWithIgnoreCase(columnName, "sex")) + { + column.setHtmlType(GenConstants.HTML_SELECT); + } + // 图片字段设置图片上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "image")) + { + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } + // 文件字段设置文件上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "file")) + { + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } + // 内容字段设置富文本控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "content")) + { + column.setHtmlType(GenConstants.HTML_EDITOR); + } + } + + /** + * 校验数组是否包含指定值 + * + * @param arr 数组 + * @param targetValue 值 + * @return 是否包含 + */ + public static boolean arraysContains(String[] arr, String targetValue) + { + return Arrays.asList(arr).contains(targetValue); + } + + /** + * 获取模块名 + * + * @param packageName 包名 + * @return 模块名 + */ + public static String getModuleName(String packageName) + { + int lastIndex = packageName.lastIndexOf("."); + int nameLength = packageName.length(); + return StringUtils.substring(packageName, lastIndex + 1, nameLength); + } + + /** + * 获取业务名 + * + * @param tableName 表名 + * @return 业务名 + */ + public static String getBusinessName(String tableName) + { + int lastIndex = tableName.lastIndexOf("_"); + int nameLength = tableName.length(); + return StringUtils.substring(tableName, lastIndex + 1, nameLength); + } + + /** + * 表名转换成Java类名 + * + * @param tableName 表名称 + * @return 类名 + */ + public static String convertClassName(String tableName) + { + boolean autoRemovePre = GenConfig.getAutoRemovePre(); + String tablePrefix = GenConfig.getTablePrefix(); + if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) + { + String[] searchList = StringUtils.split(tablePrefix, ","); + tableName = replaceFirst(tableName, searchList); + } + return StringUtils.convertToCamelCase(tableName); + } + + /** + * 批量替换前缀 + * + * @param replacementm 替换值 + * @param searchList 替换列表 + * @return + */ + public static String replaceFirst(String replacementm, String[] searchList) + { + String text = replacementm; + for (String searchString : searchList) + { + if (replacementm.startsWith(searchString)) + { + text = replacementm.replaceFirst(searchString, ""); + break; + } + } + return text; + } + + /** + * 关键字替换 + * + * @param text 需要被替换的名字 + * @return 替换后的名字 + */ + public static String replaceText(String text) + { + return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + } + + /** + * 获取数据库类型字段 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static String getDbType(String columnType) + { + if (StringUtils.indexOf(columnType, "(") > 0) + { + return StringUtils.substringBefore(columnType, "("); + } + else + { + return columnType; + } + } + + /** + * 获取字段长度 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static Integer getColumnLength(String columnType) + { + if (StringUtils.indexOf(columnType, "(") > 0) + { + String length = StringUtils.substringBetween(columnType, "(", ")"); + return Integer.valueOf(length); + } + else + { + return 0; + } + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityInitializer.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityInitializer.java new file mode 100644 index 0000000..623f180 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityInitializer.java @@ -0,0 +1,34 @@ +package com.zeroerr.gen.util; + +import java.util.Properties; +import org.apache.velocity.app.Velocity; +import com.zeroerr.common.core.constant.Constants; + +/** + * VelocityEngine工厂 + * + * @author ruoyi + */ +public class VelocityInitializer +{ + /** + * 初始化vm方法 + */ + public static void initVelocity() + { + Properties p = new Properties(); + try + { + // 加载classpath目录下的vm文件 + p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + // 定义字符集 + p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); + // 初始化Velocity引擎,指定配置Properties + Velocity.init(p); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityUtils.java b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityUtils.java new file mode 100644 index 0000000..cdd63de --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/java/com/zeroerr/gen/util/VelocityUtils.java @@ -0,0 +1,408 @@ +package com.zeroerr.gen.util; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.velocity.VelocityContext; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.zeroerr.common.core.constant.GenConstants; +import com.zeroerr.common.core.utils.DateUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.gen.domain.GenTable; +import com.zeroerr.gen.domain.GenTableColumn; + +/** + * 模板工具类 + * + * @author ruoyi + */ +public class VelocityUtils +{ + /** 项目空间路径 */ + private static final String PROJECT_PATH = "main/java"; + + /** mybatis空间路径 */ + private static final String MYBATIS_PATH = "main/resources/mapper"; + + /** 默认上级菜单,系统工具 */ + private static final String DEFAULT_PARENT_MENU_ID = "3"; + + /** + * 设置模板变量信息 + * + * @return 模板列表 + */ + public static VelocityContext prepareContext(GenTable genTable) + { + String moduleName = genTable.getModuleName(); + String businessName = genTable.getBusinessName(); + String packageName = genTable.getPackageName(); + String tplCategory = genTable.getTplCategory(); + String functionName = genTable.getFunctionName(); + + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("tplCategory", genTable.getTplCategory()); + velocityContext.put("tableName", genTable.getTableName()); + velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); + velocityContext.put("ClassName", genTable.getClassName()); + velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); + velocityContext.put("moduleName", genTable.getModuleName()); + velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); + velocityContext.put("businessName", genTable.getBusinessName()); + velocityContext.put("basePackage", getPackagePrefix(packageName)); + velocityContext.put("packageName", packageName); + velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("datetime", DateUtils.getDate()); + velocityContext.put("pkColumn", genTable.getPkColumn()); + velocityContext.put("importList", getImportList(genTable)); + velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); + velocityContext.put("columns", genTable.getColumns()); + velocityContext.put("table", genTable); + velocityContext.put("dicts", getDicts(genTable)); + setMenuVelocityContext(velocityContext, genTable); + if (GenConstants.TPL_TREE.equals(tplCategory)) + { + setTreeVelocityContext(velocityContext, genTable); + } + if (GenConstants.TPL_SUB.equals(tplCategory)) + { + setSubVelocityContext(velocityContext, genTable); + } + return velocityContext; + } + + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String parentMenuId = getParentMenuId(paramsObj); + context.put("parentMenuId", parentMenuId); + } + + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String treeCode = getTreecode(paramsObj); + String treeParentCode = getTreeParentCode(paramsObj); + String treeName = getTreeName(paramsObj); + + context.put("treeCode", treeCode); + context.put("treeParentCode", treeParentCode); + context.put("treeName", treeName); + context.put("expandColumn", getExpandColumn(genTable)); + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) + { + context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); + } + if (paramsObj.containsKey(GenConstants.TREE_NAME)) + { + context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); + } + } + + public static void setSubVelocityContext(VelocityContext context, GenTable genTable) + { + GenTable subTable = genTable.getSubTable(); + String subTableName = genTable.getSubTableName(); + String subTableFkName = genTable.getSubTableFkName(); + String subClassName = genTable.getSubTable().getClassName(); + String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName); + + context.put("subTable", subTable); + context.put("subTableName", subTableName); + context.put("subTableFkName", subTableFkName); + context.put("subTableFkClassName", subTableFkClassName); + context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName)); + context.put("subClassName", subClassName); + context.put("subclassName", StringUtils.uncapitalize(subClassName)); + context.put("subImportList", getImportList(genTable.getSubTable())); + } + + /** + * 获取模板信息 + * @param tplCategory 生成的模板 + * @param tplWebType 前端类型 + * @return 模板列表 + */ + public static List getTemplateList(String tplCategory, String tplWebType) + { + String useWebType = "vm/vue"; + if ("element-plus".equals(tplWebType)) + { + useWebType = "vm/vue/v3"; + } + List templates = new ArrayList(); + templates.add("vm/java/domain.java.vm"); + templates.add("vm/java/mapper.java.vm"); + templates.add("vm/java/service.java.vm"); + templates.add("vm/java/serviceImpl.java.vm"); + templates.add("vm/java/controller.java.vm"); + templates.add("vm/xml/mapper.xml.vm"); + templates.add("vm/sql/sql.vm"); + templates.add("vm/js/api.js.vm"); + if (GenConstants.TPL_CRUD.equals(tplCategory)) + { + templates.add(useWebType + "/index.vue.vm"); + } + else if (GenConstants.TPL_TREE.equals(tplCategory)) + { + templates.add(useWebType + "/index-tree.vue.vm"); + } + else if (GenConstants.TPL_SUB.equals(tplCategory)) + { + templates.add(useWebType + "/index.vue.vm"); + templates.add("vm/java/sub-domain.java.vm"); + } + return templates; + } + + /** + * 获取文件名 + */ + public static String getFileName(String template, GenTable genTable) + { + // 文件名称 + String fileName = ""; + // 包路径 + String packageName = genTable.getPackageName(); + // 模块名 + String moduleName = genTable.getModuleName(); + // 大写类名 + String className = genTable.getClassName(); + // 业务名称 + String businessName = genTable.getBusinessName(); + + String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); + String mybatisPath = MYBATIS_PATH + "/" + moduleName; + String vuePath = "vue"; + + if (template.contains("domain.java.vm")) + { + fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + } + if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) + { + fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); + } + else if (template.contains("mapper.java.vm")) + { + fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); + } + else if (template.contains("service.java.vm")) + { + fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); + } + else if (template.contains("serviceImpl.java.vm")) + { + fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); + } + else if (template.contains("controller.java.vm")) + { + fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); + } + else if (template.contains("mapper.xml.vm")) + { + fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); + } + else if (template.contains("sql.vm")) + { + fileName = businessName + "Menu.sql"; + } + else if (template.contains("api.js.vm")) + { + fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); + } + else if (template.contains("index.vue.vm")) + { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } + else if (template.contains("index-tree.vue.vm")) + { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } + return fileName; + } + + /** + * 获取包前缀 + * + * @param packageName 包名称 + * @return 包前缀名称 + */ + public static String getPackagePrefix(String packageName) + { + int lastIndex = packageName.lastIndexOf("."); + return StringUtils.substring(packageName, 0, lastIndex); + } + + /** + * 根据列类型获取导入包 + * + * @param genTable 业务表对象 + * @return 返回需要导入的包列表 + */ + public static HashSet getImportList(GenTable genTable) + { + List columns = genTable.getColumns(); + GenTable subGenTable = genTable.getSubTable(); + HashSet importList = new HashSet(); + if (StringUtils.isNotNull(subGenTable)) + { + importList.add("java.util.List"); + } + for (GenTableColumn column : columns) + { + if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) + { + importList.add("java.util.Date"); + importList.add("com.fasterxml.jackson.annotation.JsonFormat"); + } + else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) + { + importList.add("java.math.BigDecimal"); + } + } + return importList; + } + + /** + * 根据列类型获取字典组 + * + * @param genTable 业务表对象 + * @return 返回字典组 + */ + public static String getDicts(GenTable genTable) + { + List columns = genTable.getColumns(); + Set dicts = new HashSet(); + addDicts(dicts, columns); + if (StringUtils.isNotNull(genTable.getSubTable())) + { + List subColumns = genTable.getSubTable().getColumns(); + addDicts(dicts, subColumns); + } + return StringUtils.join(dicts, ", "); + } + + /** + * 添加字典列表 + * + * @param dicts 字典列表 + * @param columns 列集合 + */ + public static void addDicts(Set dicts, List columns) + { + for (GenTableColumn column : columns) + { + if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( + column.getHtmlType(), + new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) + { + dicts.add("'" + column.getDictType() + "'"); + } + } + } + + /** + * 获取权限前缀 + * + * @param moduleName 模块名称 + * @param businessName 业务名称 + * @return 返回权限前缀 + */ + public static String getPermissionPrefix(String moduleName, String businessName) + { + return StringUtils.format("{}:{}", moduleName, businessName); + } + + /** + * 获取上级菜单ID字段 + * + * @param paramsObj 生成其他选项 + * @return 上级菜单ID字段 + */ + public static String getParentMenuId(JSONObject paramsObj) + { + if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) + && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) + { + return paramsObj.getString(GenConstants.PARENT_MENU_ID); + } + return DEFAULT_PARENT_MENU_ID; + } + + /** + * 获取树编码 + * + * @param paramsObj 生成其他选项 + * @return 树编码 + */ + public static String getTreecode(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_CODE)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); + } + return StringUtils.EMPTY; + } + + /** + * 获取树父编码 + * + * @param paramsObj 生成其他选项 + * @return 树父编码 + */ + public static String getTreeParentCode(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); + } + return StringUtils.EMPTY; + } + + /** + * 获取树名称 + * + * @param paramsObj 生成其他选项 + * @return 树名称 + */ + public static String getTreeName(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_NAME)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); + } + return StringUtils.EMPTY; + } + + /** + * 获取需要在哪一列上面显示展开按钮 + * + * @param genTable 业务表对象 + * @return 展开按钮列序号 + */ + public static int getExpandColumn(GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String treeName = paramsObj.getString(GenConstants.TREE_NAME); + int num = 0; + for (GenTableColumn column : genTable.getColumns()) + { + if (column.isList()) + { + num++; + String columnName = column.getColumnName(); + if (columnName.equals(treeName)) + { + break; + } + } + } + return num; + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/banner.txt b/zeroerroa-modules/zeroerroa-gen/src/main/resources/banner.txt new file mode 100644 index 0000000..05f528c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ + (_) + _ __ _ _ ___ _ _ _ ______ __ _ ___ _ __ +| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \ +| | | |_| || (_) || |_| || | | (_| || __/| | | | +|_| \__,_| \___/ \__, ||_| \__, | \___||_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/bootstrap.yml b/zeroerroa-modules/zeroerroa-gen/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..4e7404b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-gen + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/logback.xml b/zeroerroa-modules/zeroerroa-gen/src/main/resources/logback.xml new file mode 100644 index 0000000..a0748ee --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..aba01f7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column + + + + + + + + insert into gen_table_column ( + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time + )values( + #{tableId}, + #{columnName}, + #{columnComment}, + #{columnType}, + #{javaType}, + #{javaField}, + #{isPk}, + #{isIncrement}, + #{isRequired}, + #{isInsert}, + #{isEdit}, + #{isList}, + #{isQuery}, + #{queryType}, + #{htmlType}, + #{dictType}, + #{sort}, + #{createBy}, + sysdate() + ) + + + + update gen_table_column + + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, + update_time = sysdate() + + where column_id = #{columnId} + + + + delete from gen_table_column where table_id in + + #{tableId} + + + + + delete from gen_table_column where column_id in + + #{item.columnId} + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..6350362 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table + + + + + + + + + + + + + + + + + + insert into gen_table ( + table_name, + table_comment, + class_name, + tpl_category, + tpl_web_type, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{tplWebType}, + #{packageName}, + #{moduleName}, + #{businessName}, + #{functionName}, + #{functionAuthor}, + #{genType}, + #{genPath}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update gen_table + + table_name = #{tableName}, + table_comment = #{tableComment}, + sub_table_name = #{subTableName}, + sub_table_fk_name = #{subTableFkName}, + class_name = #{className}, + function_author = #{functionAuthor}, + gen_type = #{genType}, + gen_path = #{genPath}, + tpl_category = #{tplCategory}, + tpl_web_type = #{tplWebType}, + package_name = #{packageName}, + module_name = #{moduleName}, + business_name = #{businessName}, + function_name = #{functionName}, + options = #{options}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where table_id = #{tableId} + + + + delete from gen_table where table_id in + + #{tableId} + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/controller.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 0000000..27e8bb3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1,116 @@ +package ${packageName}.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.zeroerr.common.core.web.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @RequiresPermissions("${permissionPrefix}:list") + @GetMapping("/list") +#if($table.crud || $table.sub) + public TableDataInfo list(${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public AjaxResult list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @RequiresPermissions("${permissionPrefix}:export") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @RequiresPermissions("${permissionPrefix}:query") + @GetMapping(value = "/{${pkColumn.javaField}}") + public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) + { + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @RequiresPermissions("${permissionPrefix}:add") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.insert${ClassName}(${className})); + } + + /** + * 修改${functionName} + */ + @RequiresPermissions("${permissionPrefix}:edit") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.update${ClassName}(${className})); + } + + /** + * 删除${functionName} + */ + @RequiresPermissions("${permissionPrefix}:remove") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) + { + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/domain.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/domain.java.vm new file mode 100644 index 0000000..d05962a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/domain.java.vm @@ -0,0 +1,105 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +#if($table.crud || $table.sub) +import com.zeroerr.common.core.web.domain.BaseEntity; +#elseif($table.tree) +import com.zeroerr.common.core.web.domain.TreeEntity; +#end + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end +public class ${ClassName} extends ${Entity} +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("(")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + +#if($table.sub) + public List<${subClassName}> get${subClassName}List() + { + return ${subclassName}List; + } + + public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List = ${subclassName}List; + } + +#end + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end +#if($table.sub) + .append("${subclassName}List", get${subClassName}List()) +#end + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/mapper.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/mapper.java.vm new file mode 100644 index 0000000..7e7d7c2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/mapper.java.vm @@ -0,0 +1,91 @@ +package ${packageName}.mapper; + +import java.util.List; +import ${packageName}.domain.${ClassName}; +#if($table.sub) +import ${packageName}.domain.${subClassName}; +#end + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +#if($table.sub) + + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/service.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/service.java.vm new file mode 100644 index 0000000..264882b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/service.java.vm @@ -0,0 +1,61 @@ +package ${packageName}.service; + +import java.util.List; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/serviceImpl.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..2157d41 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -0,0 +1,169 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.zeroerr.common.core.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +#if($table.sub) +import java.util.ArrayList; +import com.zeroerr.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service +{ + @Autowired + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) + { + return ${className}Mapper.select${ClassName}List(${className}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert${ClassName}(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); + insert${subClassName}(${className}); +#end + return ${className}Mapper.update${ClassName}(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } +#if($table.sub) + + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) + { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) + { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} : ${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) + { + ${className}Mapper.batch${subClassName}(list); + } + } + } +#end +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/sub-domain.java.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..0f77e5a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -0,0 +1,76 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("(")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/js/api.js.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/sql/sql.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/sql/sql.vm new file mode 100644 index 0000000..0575583 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/sql/sql.vm @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index-tree.vue.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..a4c64a0 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index.vue.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/index.vue.vm @@ -0,0 +1,602 @@ + + + diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm new file mode 100644 index 0000000..7bbd2fc --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index.vue.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index.vue.vm new file mode 100644 index 0000000..8b25665 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/vue/v3/index.vue.vm @@ -0,0 +1,590 @@ + + + diff --git a/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/xml/mapper.xml.vm b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..456755b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-gen/src/main/resources/vm/xml/mapper.xml.vm @@ -0,0 +1,140 @@ + + + + + +#foreach ($column in $columns) + +#end + +#if($table.sub) + + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + + + + + +#if($table.sub) + + +#end + + + insert into ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + $column.columnName, +#end +#end + + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + #{$column.javaField}, +#end +#end + + + + + update ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName) + $column.columnName = #{$column.javaField}, +#end +#end + + where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} in + + #{${pkColumn.javaField}} + + +#if($table.sub) + + + delete from ${subTableName} where ${subTableFkName} in + + #{${subTableFkclassName}} + + + + + delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} + + + + insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values + + (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) + + +#end + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/pom.xml b/zeroerroa-modules/zeroerroa-job/pom.xml new file mode 100644 index 0000000..da65cce --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/pom.xml @@ -0,0 +1,100 @@ + + + + com.zeroerr + zeroerroa-modules + 3.6.4 + + 4.0.0 + + zeroerroa-modules-job + + + zeroerroa-modules-job定时任务 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + com.mysql + mysql-connector-j + + + + + com.zeroerr + zeroerroa-common-log + + + + + com.zeroerr + zeroerroa-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/ZeroErrJobApplication.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/ZeroErrJobApplication.java new file mode 100644 index 0000000..ec0ae1b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/ZeroErrJobApplication.java @@ -0,0 +1,34 @@ +package com.zeroerr.job; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.zeroerr.common.security.annotation.EnableCustomConfig; +import com.zeroerr.common.security.annotation.EnableRyFeignClients; +import com.zeroerr.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 定时任务 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZeroErrJobApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrJobApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 定时任务模块启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/config/ScheduleConfig.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/config/ScheduleConfig.java new file mode 100644 index 0000000..b641a7e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/config/ScheduleConfig.java @@ -0,0 +1,57 @@ +//package com.zeroerr.job.config; +// +//import java.util.Properties; +//import javax.sql.DataSource; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.scheduling.quartz.SchedulerFactoryBean; +// +///** +// * 定时任务配置(单机部署建议删除此类和qrtz数据库表,默认走内存会最高效) +// * +// * @author ruoyi +// */ +//@Configuration +//public class ScheduleConfig +//{ +// @Bean +// public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) +// { +// SchedulerFactoryBean factory = new SchedulerFactoryBean(); +// factory.setDataSource(dataSource); +// +// // quartz参数 +// Properties prop = new Properties(); +// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceId", "AUTO"); +// // 线程池配置 +// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); +// prop.put("org.quartz.threadPool.threadCount", "20"); +// prop.put("org.quartz.threadPool.threadPriority", "5"); +// // JobStore配置 +// prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore"); +// // 集群配置 +// prop.put("org.quartz.jobStore.isClustered", "true"); +// prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000"); +// prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "10"); +// prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); +// +// // sqlserver 启用 +// // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); +// prop.put("org.quartz.jobStore.misfireThreshold", "12000"); +// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); +// factory.setQuartzProperties(prop); +// +// factory.setSchedulerName("RuoyiScheduler"); +// // 延时启动 +// factory.setStartupDelay(1); +// factory.setApplicationContextSchedulerContextKey("applicationContextKey"); +// // 可选,QuartzScheduler +// // 启动时更新己存在的Job,这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了 +// factory.setOverwriteExistingJobs(true); +// // 设置自动启动,默认为true +// factory.setAutoStartup(true); +// +// return factory; +// } +//} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobController.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobController.java new file mode 100644 index 0000000..0fee344 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobController.java @@ -0,0 +1,186 @@ +package com.zeroerr.job.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.exception.job.TaskException; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.job.domain.SysJob; +import com.zeroerr.job.service.ISysJobService; +import com.zeroerr.job.util.CronUtils; +import com.zeroerr.job.util.ScheduleUtils; + +/** + * 调度任务信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/job") +public class SysJobController extends BaseController +{ + @Autowired + private ISysJobService jobService; + + /** + * 查询定时任务列表 + */ + @RequiresPermissions("monitor:job:list") + @GetMapping("/list") + public TableDataInfo list(SysJob sysJob) + { + startPage(); + List list = jobService.selectJobList(sysJob); + return getDataTable(list); + } + + /** + * 导出定时任务列表 + */ + @RequiresPermissions("monitor:job:export") + @Log(title = "定时任务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysJob sysJob) + { + List list = jobService.selectJobList(sysJob); + ExcelUtil util = new ExcelUtil(SysJob.class); + util.exportExcel(response, list, "定时任务"); + } + + /** + * 获取定时任务详细信息 + */ + @RequiresPermissions("monitor:job:query") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") Long jobId) + { + return success(jobService.selectJobById(jobId)); + } + + /** + * 新增定时任务 + */ + @RequiresPermissions("monitor:job:add") + @Log(title = "定时任务", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(job.getCronExpression())) + { + return error("新增任务'" + job.getJobName() + "'失败,Cron表达式不正确"); + } + else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) + { + return error("新增任务'" + job.getJobName() + "'失败,目标字符串不允许'rmi'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) + { + return error("新增任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) + { + return error("新增任务'" + job.getJobName() + "'失败,目标字符串不允许'http(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) + { + return error("新增任务'" + job.getJobName() + "'失败,目标字符串存在违规"); + } + else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + { + return error("新增任务'" + job.getJobName() + "'失败,目标字符串不在白名单内"); + } + job.setCreateBy(SecurityUtils.getUsername()); + return toAjax(jobService.insertJob(job)); + } + + /** + * 修改定时任务 + */ + @RequiresPermissions("monitor:job:edit") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(job.getCronExpression())) + { + return error("修改任务'" + job.getJobName() + "'失败,Cron表达式不正确"); + } + else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) + { + return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'rmi'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) + { + return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'ldap(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) + { + return error("修改任务'" + job.getJobName() + "'失败,目标字符串不允许'http(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) + { + return error("修改任务'" + job.getJobName() + "'失败,目标字符串存在违规"); + } + else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + { + return error("修改任务'" + job.getJobName() + "'失败,目标字符串不在白名单内"); + } + job.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(jobService.updateJob(job)); + } + + /** + * 定时任务状态修改 + */ + @RequiresPermissions("monitor:job:changeStatus") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException + { + SysJob newJob = jobService.selectJobById(job.getJobId()); + newJob.setStatus(job.getStatus()); + return toAjax(jobService.changeStatus(newJob)); + } + + /** + * 定时任务立即执行一次 + */ + @RequiresPermissions("monitor:job:changeStatus") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/run") + public AjaxResult run(@RequestBody SysJob job) throws SchedulerException + { + boolean result = jobService.run(job); + return result ? success() : error("任务不存在或已过期!"); + } + + /** + * 删除定时任务 + */ + @RequiresPermissions("monitor:job:remove") + @Log(title = "定时任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException + { + jobService.deleteJobByIds(jobIds); + return success(); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobLogController.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobLogController.java new file mode 100644 index 0000000..c75e3f7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/controller/SysJobLogController.java @@ -0,0 +1,91 @@ +package com.zeroerr.job.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.job.domain.SysJobLog; +import com.zeroerr.job.service.ISysJobLogService; + +/** + * 调度日志操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/job/log") +public class SysJobLogController extends BaseController +{ + @Autowired + private ISysJobLogService jobLogService; + + /** + * 查询定时任务调度日志列表 + */ + @RequiresPermissions("monitor:job:list") + @GetMapping("/list") + public TableDataInfo list(SysJobLog sysJobLog) + { + startPage(); + List list = jobLogService.selectJobLogList(sysJobLog); + return getDataTable(list); + } + + /** + * 导出定时任务调度日志列表 + */ + @RequiresPermissions("monitor:job:export") + @Log(title = "任务调度日志", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysJobLog sysJobLog) + { + List list = jobLogService.selectJobLogList(sysJobLog); + ExcelUtil util = new ExcelUtil(SysJobLog.class); + util.exportExcel(response, list, "调度日志"); + } + + /** + * 根据调度编号获取详细信息 + */ + @RequiresPermissions("monitor:job:query") + @GetMapping(value = "/{jobLogId}") + public AjaxResult getInfo(@PathVariable Long jobLogId) + { + return success(jobLogService.selectJobLogById(jobLogId)); + } + + /** + * 删除定时任务调度日志 + */ + @RequiresPermissions("monitor:job:remove") + @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobLogIds}") + public AjaxResult remove(@PathVariable Long[] jobLogIds) + { + return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); + } + + /** + * 清空定时任务调度日志 + */ + @RequiresPermissions("monitor:job:remove") + @Log(title = "调度日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return success(); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJob.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJob.java new file mode 100644 index 0000000..1634685 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJob.java @@ -0,0 +1,171 @@ +package com.zeroerr.job.domain; + +import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.constant.ScheduleConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.domain.BaseEntity; +import com.zeroerr.job.util.CronUtils; + +/** + * 定时任务调度表 sys_job + * + * @author ruoyi + */ +public class SysJob extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 任务ID */ + @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) + private Long jobId; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String jobName; + + /** 任务组名 */ + @Excel(name = "任务组名") + private String jobGroup; + + /** 调用目标字符串 */ + @Excel(name = "调用目标字符串") + private String invokeTarget; + + /** cron执行表达式 */ + @Excel(name = "执行表达式 ") + private String cronExpression; + + /** cron计划策略 */ + @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") + private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; + + /** 是否并发执行(0允许 1禁止) */ + @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") + private String concurrent; + + /** 任务状态(0正常 1暂停) */ + @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") + private String status; + + public Long getJobId() + { + return jobId; + } + + public void setJobId(Long jobId) + { + this.jobId = jobId; + } + + @NotBlank(message = "任务名称不能为空") + @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + @NotBlank(message = "调用目标字符串不能为空") + @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + @NotBlank(message = "Cron执行表达式不能为空") + @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") + public String getCronExpression() + { + return cronExpression; + } + + public void setCronExpression(String cronExpression) + { + this.cronExpression = cronExpression; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + public Date getNextValidTime() + { + if (StringUtils.isNotEmpty(cronExpression)) + { + return CronUtils.getNextExecution(cronExpression); + } + return null; + } + + public String getMisfirePolicy() + { + return misfirePolicy; + } + + public void setMisfirePolicy(String misfirePolicy) + { + this.misfirePolicy = misfirePolicy; + } + + public String getConcurrent() + { + return concurrent; + } + + public void setConcurrent(String concurrent) + { + this.concurrent = concurrent; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("cronExpression", getCronExpression()) + .append("nextValidTime", getNextValidTime()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJobLog.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJobLog.java new file mode 100644 index 0000000..8d946b4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/domain/SysJobLog.java @@ -0,0 +1,155 @@ +package com.zeroerr.job.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 定时任务调度日志表 sys_job_log + * + * @author ruoyi + */ +public class SysJobLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "日志序号") + private Long jobLogId; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String jobName; + + /** 任务组名 */ + @Excel(name = "任务组名") + private String jobGroup; + + /** 调用目标字符串 */ + @Excel(name = "调用目标字符串") + private String invokeTarget; + + /** 日志信息 */ + @Excel(name = "日志信息") + private String jobMessage; + + /** 执行状态(0正常 1失败) */ + @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") + private String status; + + /** 异常信息 */ + @Excel(name = "异常信息") + private String exceptionInfo; + + /** 开始时间 */ + private Date startTime; + + /** 停止时间 */ + private Date stopTime; + + public Long getJobLogId() + { + return jobLogId; + } + + public void setJobLogId(Long jobLogId) + { + this.jobLogId = jobLogId; + } + + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + public String getJobMessage() + { + return jobMessage; + } + + public void setJobMessage(String jobMessage) + { + this.jobMessage = jobMessage; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getExceptionInfo() + { + return exceptionInfo; + } + + public void setExceptionInfo(String exceptionInfo) + { + this.exceptionInfo = exceptionInfo; + } + + public Date getStartTime() + { + return startTime; + } + + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStopTime() + { + return stopTime; + } + + public void setStopTime(Date stopTime) + { + this.stopTime = stopTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobLogMapper.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobLogMapper.java new file mode 100644 index 0000000..2b2a67a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobLogMapper.java @@ -0,0 +1,66 @@ +package com.zeroerr.job.mapper; + +import java.util.List; +import com.zeroerr.job.domain.SysJobLog; +import org.springframework.stereotype.Repository; + +/** + * 调度任务日志信息 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysJobLogMapper +{ + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 查询所有调度任务日志 + * + * @return 调度任务日志列表 + */ + public List selectJobLogAll(); + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + * @return 结果 + */ + public int insertJobLog(SysJobLog jobLog); + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的数据ID + * @return 结果 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + * @return 结果 + */ + public int deleteJobLogById(Long jobId); + + /** + * 清空任务日志 + */ + public void cleanJobLog(); +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobMapper.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobMapper.java new file mode 100644 index 0000000..ea2adab --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/mapper/SysJobMapper.java @@ -0,0 +1,69 @@ +package com.zeroerr.job.mapper; + +import java.util.List; +import com.zeroerr.job.domain.SysJob; +import org.springframework.stereotype.Repository; + +/** + * 调度任务信息 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysJobMapper +{ + /** + * 查询调度任务日志集合 + * + * @param job 调度信息 + * @return 操作日志集合 + */ + public List selectJobList(SysJob job); + + /** + * 查询所有调度任务 + * + * @return 调度任务列表 + */ + public List selectJobAll(); + + /** + * 通过调度ID查询调度任务信息 + * + * @param jobId 调度ID + * @return 角色对象信息 + */ + public SysJob selectJobById(Long jobId); + + /** + * 通过调度ID删除调度任务信息 + * + * @param jobId 调度ID + * @return 结果 + */ + public int deleteJobById(Long jobId); + + /** + * 批量删除调度任务信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteJobByIds(Long[] ids); + + /** + * 修改调度任务信息 + * + * @param job 调度任务信息 + * @return 结果 + */ + public int updateJob(SysJob job); + + /** + * 新增调度任务信息 + * + * @param job 调度任务信息 + * @return 结果 + */ + public int insertJob(SysJob job); +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobLogService.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobLogService.java new file mode 100644 index 0000000..6389622 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobLogService.java @@ -0,0 +1,56 @@ +package com.zeroerr.job.service; + +import java.util.List; +import com.zeroerr.job.domain.SysJobLog; + +/** + * 定时任务调度日志信息信息 服务层 + * + * @author ruoyi + */ +public interface ISysJobLogService +{ + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + */ + public void addJobLog(SysJobLog jobLog); + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的日志ID + * @return 结果 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + * @return 结果 + */ + public int deleteJobLogById(Long jobId); + + /** + * 清空任务日志 + */ + public void cleanJobLog(); +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobService.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobService.java new file mode 100644 index 0000000..2b81350 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/ISysJobService.java @@ -0,0 +1,102 @@ +package com.zeroerr.job.service; + +import java.util.List; +import org.quartz.SchedulerException; +import com.zeroerr.common.core.exception.job.TaskException; +import com.zeroerr.job.domain.SysJob; + +/** + * 定时任务调度信息信息 服务层 + * + * @author ruoyi + */ +public interface ISysJobService +{ + /** + * 获取quartz调度器的计划任务 + * + * @param job 调度信息 + * @return 调度任务集合 + */ + public List selectJobList(SysJob job); + + /** + * 通过调度任务ID查询调度信息 + * + * @param jobId 调度任务ID + * @return 调度任务对象信息 + */ + public SysJob selectJobById(Long jobId); + + /** + * 暂停任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int pauseJob(SysJob job) throws SchedulerException; + + /** + * 恢复任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int resumeJob(SysJob job) throws SchedulerException; + + /** + * 删除任务后,所对应的trigger也将被删除 + * + * @param job 调度信息 + * @return 结果 + */ + public int deleteJob(SysJob job) throws SchedulerException; + + /** + * 批量删除调度信息 + * + * @param jobIds 需要删除的任务ID + * @return 结果 + */ + public void deleteJobByIds(Long[] jobIds) throws SchedulerException; + + /** + * 任务调度状态修改 + * + * @param job 调度信息 + * @return 结果 + */ + public int changeStatus(SysJob job) throws SchedulerException; + + /** + * 立即运行任务 + * + * @param job 调度信息 + * @return 结果 + */ + public boolean run(SysJob job) throws SchedulerException; + + /** + * 新增任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int insertJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 更新任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int updateJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 校验cron表达式是否有效 + * + * @param cronExpression 表达式 + * @return 结果 + */ + public boolean checkCronExpressionIsValid(String cronExpression); +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobLogServiceImpl.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobLogServiceImpl.java new file mode 100644 index 0000000..fd3d38e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobLogServiceImpl.java @@ -0,0 +1,86 @@ +package com.zeroerr.job.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.job.domain.SysJobLog; +import com.zeroerr.job.mapper.SysJobLogMapper; + +/** + * 定时任务调度日志信息 服务层 + * + * @author ruoyi + */ +@Service +public class SysJobLogServiceImpl implements ISysJobLogService +{ + @Autowired + private SysJobLogMapper jobLogMapper; + + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + @Override + public List selectJobLogList(SysJobLog jobLog) + { + return jobLogMapper.selectJobLogList(jobLog); + } + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + @Override + public SysJobLog selectJobLogById(Long jobLogId) + { + return jobLogMapper.selectJobLogById(jobLogId); + } + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + */ + @Override + public void addJobLog(SysJobLog jobLog) + { + jobLogMapper.insertJobLog(jobLog); + } + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteJobLogByIds(Long[] logIds) + { + return jobLogMapper.deleteJobLogByIds(logIds); + } + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + */ + @Override + public int deleteJobLogById(Long jobId) + { + return jobLogMapper.deleteJobLogById(jobId); + } + + /** + * 清空任务日志 + */ + @Override + public void cleanJobLog() + { + jobLogMapper.cleanJobLog(); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobServiceImpl.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobServiceImpl.java new file mode 100644 index 0000000..fb55e30 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/service/SysJobServiceImpl.java @@ -0,0 +1,260 @@ +package com.zeroerr.job.service; + +import java.util.List; +import javax.annotation.PostConstruct; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.zeroerr.common.core.constant.ScheduleConstants; +import com.zeroerr.common.core.exception.job.TaskException; +import com.zeroerr.job.domain.SysJob; +import com.zeroerr.job.mapper.SysJobMapper; +import com.zeroerr.job.util.CronUtils; +import com.zeroerr.job.util.ScheduleUtils; + +/** + * 定时任务调度信息 服务层 + * + * @author ruoyi + */ +@Service +public class SysJobServiceImpl implements ISysJobService +{ + @Autowired + private Scheduler scheduler; + + @Autowired + private SysJobMapper jobMapper; + + /** + * 项目启动时,初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理(注:不能手动修改数据库ID和任务组名,否则会导致脏数据) + */ + @PostConstruct + public void init() throws SchedulerException, TaskException + { + scheduler.clear(); + List jobList = jobMapper.selectJobAll(); + for (SysJob job : jobList) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + } + + /** + * 获取quartz调度器的计划任务列表 + * + * @param job 调度信息 + * @return + */ + @Override + public List selectJobList(SysJob job) + { + return jobMapper.selectJobList(job); + } + + /** + * 通过调度任务ID查询调度信息 + * + * @param jobId 调度任务ID + * @return 调度任务对象信息 + */ + @Override + public SysJob selectJobById(Long jobId) + { + return jobMapper.selectJobById(jobId); + } + + /** + * 暂停任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int pauseJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 恢复任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int resumeJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 删除任务后,所对应的trigger也将被删除 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + int rows = jobMapper.deleteJobById(jobId); + if (rows > 0) + { + scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 批量删除调度信息 + * + * @param jobIds 需要删除的任务ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteJobByIds(Long[] jobIds) throws SchedulerException + { + for (Long jobId : jobIds) + { + SysJob job = jobMapper.selectJobById(jobId); + deleteJob(job); + } + } + + /** + * 任务调度状态修改 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(SysJob job) throws SchedulerException + { + int rows = 0; + String status = job.getStatus(); + if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) + { + rows = resumeJob(job); + } + else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) + { + rows = pauseJob(job); + } + return rows; + } + + /** + * 立即运行任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean run(SysJob job) throws SchedulerException + { + boolean result = false; + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + SysJob properties = selectJobById(job.getJobId()); + // 参数 + JobDataMap dataMap = new JobDataMap(); + dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); + JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + if (scheduler.checkExists(jobKey)) + { + result = true; + scheduler.triggerJob(jobKey, dataMap); + } + return result; + } + + /** + * 新增任务 + * + * @param job 调度信息 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertJob(SysJob job) throws SchedulerException, TaskException + { + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.insertJob(job); + if (rows > 0) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + return rows; + } + + /** + * 更新任务的时间表达式 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateJob(SysJob job) throws SchedulerException, TaskException + { + SysJob properties = selectJobById(job.getJobId()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + updateSchedulerJob(job, properties.getJobGroup()); + } + return rows; + } + + /** + * 更新任务 + * + * @param job 任务对象 + * @param jobGroup 任务组名 + */ + public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException + { + Long jobId = job.getJobId(); + // 判断是否存在 + JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + if (scheduler.checkExists(jobKey)) + { + // 防止创建时存在数据问题 先移除,然后在执行创建操作 + scheduler.deleteJob(jobKey); + } + ScheduleUtils.createScheduleJob(scheduler, job); + } + + /** + * 校验cron表达式是否有效 + * + * @param cronExpression 表达式 + * @return 结果 + */ + @Override + public boolean checkCronExpressionIsValid(String cronExpression) + { + return CronUtils.isValid(cronExpression); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/task/RyTask.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/task/RyTask.java new file mode 100644 index 0000000..fb1b0ee --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/task/RyTask.java @@ -0,0 +1,28 @@ +package com.zeroerr.job.task; + +import org.springframework.stereotype.Component; +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 定时任务调度测试 + * + * @author ruoyi + */ +@Component("ryTask") +public class RyTask +{ + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) + { + System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i)); + } + + public void ryParams(String params) + { + System.out.println("执行有参方法:" + params); + } + + public void ryNoParams() + { + System.out.println("执行无参方法"); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/AbstractQuartzJob.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/AbstractQuartzJob.java new file mode 100644 index 0000000..c14bdb6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/AbstractQuartzJob.java @@ -0,0 +1,106 @@ +package com.zeroerr.job.util; + +import java.util.Date; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.zeroerr.common.core.constant.ScheduleConstants; +import com.zeroerr.common.core.utils.ExceptionUtil; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.bean.BeanUtils; +import com.zeroerr.job.domain.SysJob; +import com.zeroerr.job.domain.SysJobLog; +import com.zeroerr.job.service.ISysJobLogService; + +/** + * 抽象quartz调用 + * + * @author ruoyi + */ +public abstract class AbstractQuartzJob implements Job +{ + private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); + + /** + * 线程本地变量 + */ + private static ThreadLocal threadLocal = new ThreadLocal<>(); + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException + { + SysJob sysJob = new SysJob(); + BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); + try + { + before(context, sysJob); + if (sysJob != null) + { + doExecute(context, sysJob); + } + after(context, sysJob, null); + } + catch (Exception e) + { + log.error("任务执行异常 - :", e); + after(context, sysJob, e); + } + } + + /** + * 执行前 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + */ + protected void before(JobExecutionContext context, SysJob sysJob) + { + threadLocal.set(new Date()); + } + + /** + * 执行后 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + */ + protected void after(JobExecutionContext context, SysJob sysJob, Exception e) + { + Date startTime = threadLocal.get(); + threadLocal.remove(); + + final SysJobLog sysJobLog = new SysJobLog(); + sysJobLog.setJobName(sysJob.getJobName()); + sysJobLog.setJobGroup(sysJob.getJobGroup()); + sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); + sysJobLog.setStartTime(startTime); + sysJobLog.setStopTime(new Date()); + long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); + sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时:" + runMs + "毫秒"); + if (e != null) + { + sysJobLog.setStatus("1"); + String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); + sysJobLog.setExceptionInfo(errorMsg); + } + else + { + sysJobLog.setStatus("0"); + } + + // 写入数据库当中 + SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); + } + + /** + * 执行方法,由子类重载 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + * @throws Exception 执行过程中的异常 + */ + protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/CronUtils.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/CronUtils.java new file mode 100644 index 0000000..5ceae84 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/CronUtils.java @@ -0,0 +1,63 @@ +package com.zeroerr.job.util; + +import java.text.ParseException; +import java.util.Date; +import org.quartz.CronExpression; + +/** + * cron表达式工具类 + * + * @author ruoyi + * + */ +public class CronUtils +{ + /** + * 返回一个布尔值代表一个给定的Cron表达式的有效性 + * + * @param cronExpression Cron表达式 + * @return boolean 表达式是否有效 + */ + public static boolean isValid(String cronExpression) + { + return CronExpression.isValidExpression(cronExpression); + } + + /** + * 返回一个字符串值,表示该消息无效Cron表达式给出有效性 + * + * @param cronExpression Cron表达式 + * @return String 无效时返回表达式错误描述,如果有效返回null + */ + public static String getInvalidMessage(String cronExpression) + { + try + { + new CronExpression(cronExpression); + return null; + } + catch (ParseException pe) + { + return pe.getMessage(); + } + } + + /** + * 返回下一个执行时间根据给定的Cron表达式 + * + * @param cronExpression Cron表达式 + * @return Date 下次Cron表达式执行时间 + */ + public static Date getNextExecution(String cronExpression) + { + try + { + CronExpression cron = new CronExpression(cronExpression); + return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); + } + catch (ParseException e) + { + throw new IllegalArgumentException(e.getMessage()); + } + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/JobInvokeUtil.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/JobInvokeUtil.java new file mode 100644 index 0000000..d341a75 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/JobInvokeUtil.java @@ -0,0 +1,182 @@ +package com.zeroerr.job.util; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.job.domain.SysJob; + +/** + * 任务执行工具 + * + * @author ruoyi + */ +public class JobInvokeUtil +{ + /** + * 执行方法 + * + * @param sysJob 系统任务 + */ + public static void invokeMethod(SysJob sysJob) throws Exception + { + String invokeTarget = sysJob.getInvokeTarget(); + String beanName = getBeanName(invokeTarget); + String methodName = getMethodName(invokeTarget); + List methodParams = getMethodParams(invokeTarget); + + if (!isValidClassName(beanName)) + { + Object bean = SpringUtils.getBean(beanName); + invokeMethod(bean, methodName, methodParams); + } + else + { + Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance(); + invokeMethod(bean, methodName, methodParams); + } + } + + /** + * 调用任务方法 + * + * @param bean 目标对象 + * @param methodName 方法名称 + * @param methodParams 方法参数 + */ + private static void invokeMethod(Object bean, String methodName, List methodParams) + throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException + { + if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) + { + Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams)); + method.invoke(bean, getMethodParamsValue(methodParams)); + } + else + { + Method method = bean.getClass().getMethod(methodName); + method.invoke(bean); + } + } + + /** + * 校验是否为为class包名 + * + * @param invokeTarget 名称 + * @return true是 false否 + */ + public static boolean isValidClassName(String invokeTarget) + { + return StringUtils.countMatches(invokeTarget, ".") > 1; + } + + /** + * 获取bean名称 + * + * @param invokeTarget 目标字符串 + * @return bean名称 + */ + public static String getBeanName(String invokeTarget) + { + String beanName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringBeforeLast(beanName, "."); + } + + /** + * 获取bean方法 + * + * @param invokeTarget 目标字符串 + * @return method方法 + */ + public static String getMethodName(String invokeTarget) + { + String methodName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringAfterLast(methodName, "."); + } + + /** + * 获取method方法参数相关列表 + * + * @param invokeTarget 目标字符串 + * @return method方法相关参数列表 + */ + public static List getMethodParams(String invokeTarget) + { + String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); + if (StringUtils.isEmpty(methodStr)) + { + return null; + } + String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)"); + List classs = new LinkedList<>(); + for (int i = 0; i < methodParams.length; i++) + { + String str = StringUtils.trimToEmpty(methodParams[i]); + // String字符串类型,以'或"开头 + if (StringUtils.startsWithAny(str, "'", "\"")) + { + classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class }); + } + // boolean布尔类型,等于true或者false + else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) + { + classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); + } + // long长整形,以L结尾 + else if (StringUtils.endsWith(str, "L")) + { + classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class }); + } + // double浮点类型,以D结尾 + else if (StringUtils.endsWith(str, "D")) + { + classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class }); + } + // 其他类型归类为整形 + else + { + classs.add(new Object[] { Integer.valueOf(str), Integer.class }); + } + } + return classs; + } + + /** + * 获取参数类型 + * + * @param methodParams 参数相关列表 + * @return 参数类型列表 + */ + public static Class[] getMethodParamsType(List methodParams) + { + Class[] classs = new Class[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Class) os[1]; + index++; + } + return classs; + } + + /** + * 获取参数值 + * + * @param methodParams 参数相关列表 + * @return 参数值列表 + */ + public static Object[] getMethodParamsValue(List methodParams) + { + Object[] classs = new Object[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Object) os[0]; + index++; + } + return classs; + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzDisallowConcurrentExecution.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzDisallowConcurrentExecution.java new file mode 100644 index 0000000..2a5a66e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzDisallowConcurrentExecution.java @@ -0,0 +1,22 @@ +package com.zeroerr.job.util; + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; + +import com.zeroerr.job.domain.SysJob; + +/** + * 定时任务处理(禁止并发执行) + * + * @author ruoyi + * + */ +@DisallowConcurrentExecution +public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzJobExecution.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzJobExecution.java new file mode 100644 index 0000000..e506b21 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/QuartzJobExecution.java @@ -0,0 +1,20 @@ +package com.zeroerr.job.util; + +import org.quartz.JobExecutionContext; + +import com.zeroerr.job.domain.SysJob; + +/** + * 定时任务处理(允许并发执行) + * + * @author ruoyi + * + */ +public class QuartzJobExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/ScheduleUtils.java b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/ScheduleUtils.java new file mode 100644 index 0000000..3fdd421 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/java/com/zeroerr/job/util/ScheduleUtils.java @@ -0,0 +1,141 @@ +package com.zeroerr.job.util; + +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.Job; +import org.quartz.JobBuilder; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.TriggerBuilder; +import org.quartz.TriggerKey; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.constant.ScheduleConstants; +import com.zeroerr.common.core.exception.job.TaskException; +import com.zeroerr.common.core.exception.job.TaskException.Code; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.job.domain.SysJob; + +/** + * 定时任务工具类 + * + * @author ruoyi + * + */ +public class ScheduleUtils +{ + /** + * 得到quartz任务类 + * + * @param sysJob 执行计划 + * @return 具体执行任务类 + */ + private static Class getQuartzJobClass(SysJob sysJob) + { + boolean isConcurrent = "0".equals(sysJob.getConcurrent()); + return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; + } + + /** + * 构建任务触发对象 + */ + public static TriggerKey getTriggerKey(Long jobId, String jobGroup) + { + return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 构建任务键对象 + */ + public static JobKey getJobKey(Long jobId, String jobGroup) + { + return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 创建定时任务 + */ + public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException + { + Class jobClass = getQuartzJobClass(job); + // 构建job信息 + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build(); + + // 表达式调度构建器 + CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); + cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder); + + // 按新的cronExpression表达式构建一个新的trigger + CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup)) + .withSchedule(cronScheduleBuilder).build(); + + // 放入参数,运行时的方法可以获取 + jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); + + // 判断是否存在 + if (scheduler.checkExists(getJobKey(jobId, jobGroup))) + { + // 防止创建时存在数据问题 先移除,然后在执行创建操作 + scheduler.deleteJob(getJobKey(jobId, jobGroup)); + } + + // 判断任务是否过期 + if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression()))) + { + // 执行调度任务 + scheduler.scheduleJob(jobDetail, trigger); + } + + // 暂停任务 + if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + } + + /** + * 设置定时任务策略 + */ + public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) + throws TaskException + { + switch (job.getMisfirePolicy()) + { + case ScheduleConstants.MISFIRE_DEFAULT: + return cb; + case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: + return cb.withMisfireHandlingInstructionIgnoreMisfires(); + case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED: + return cb.withMisfireHandlingInstructionFireAndProceed(); + case ScheduleConstants.MISFIRE_DO_NOTHING: + return cb.withMisfireHandlingInstructionDoNothing(); + default: + throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() + + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR); + } + } + + /** + * 检查包名是否为白名单配置 + * + * @param invokeTarget 目标字符串 + * @return 结果 + */ + public static boolean whiteList(String invokeTarget) + { + String packageName = StringUtils.substringBefore(invokeTarget, "("); + int count = StringUtils.countMatches(packageName, "."); + if (count > 1) + { + return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR); + } + Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]); + String beanPackageName = obj.getClass().getPackage().getName(); + return StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_WHITELIST_STR) + && !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/resources/banner.txt b/zeroerroa-modules/zeroerroa-job/src/main/resources/banner.txt new file mode 100644 index 0000000..0b9cd42 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) (_) | | + _ __ _ _ ___ _ _ _ ______ _ ___ | |__ +| '__|| | | | / _ \ | | | || ||______| | | / _ \ | '_ \ +| | | |_| || (_) || |_| || | | || (_) || |_) | +|_| \__,_| \___/ \__, ||_| | | \___/ |_.__/ + __/ | _/ | + |___/ |__/ \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/resources/bootstrap.yml b/zeroerroa-modules/zeroerroa-job/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..51e4d3f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9203 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-job + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-modules/zeroerroa-job/src/main/resources/logback.xml b/zeroerroa-modules/zeroerroa-job/src/main/resources/logback.xml new file mode 100644 index 0000000..e9523a7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobLogMapper.xml new file mode 100644 index 0000000..4a7ee5a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + from sys_job_log + + + + + + + + + + delete from sys_job_log where job_log_id = #{jobLogId} + + + + delete from sys_job_log where job_log_id in + + #{jobLogId} + + + + + truncate table sys_job_log + + + + insert into sys_job_log( + job_log_id, + job_name, + job_group, + invoke_target, + job_message, + status, + exception_info, + create_time + )values( + #{jobLogId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{jobMessage}, + #{status}, + #{exceptionInfo}, + sysdate() + ) + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobMapper.xml b/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobMapper.xml new file mode 100644 index 0000000..d84da95 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + from sys_job + + + + + + + + + + delete from sys_job where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/pom.xml b/zeroerroa-modules/zeroerroa-recruit/pom.xml new file mode 100644 index 0000000..a37916a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/pom.xml @@ -0,0 +1,112 @@ + + + + zeroerroa-modules + com.zeroerr + 3.6.4 + + 4.0.0 + + zeroerroa-modules-recruit + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.zeroerr + zeroerroa-common-datasource + + + + + com.zeroerr + zeroerroa-common-datascope + + + + + com.zeroerr + zeroerroa-common-log + + + + + com.zeroerr + zeroerroa-common-swagger + + + + + com.alibaba + easyexcel + 3.1.2 + + + + com.zeroerr + zeroerroa-modules-system + 3.6.4 + + + + com.zeroerr + zeroerroa-modules-file + 3.6.4 + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/ZeroErrRecruitApplication.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/ZeroErrRecruitApplication.java new file mode 100644 index 0000000..5e34022 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/ZeroErrRecruitApplication.java @@ -0,0 +1,34 @@ +package com.zeroerr.recruit; + +import com.zeroerr.common.security.annotation.EnableCustomConfig; +import com.zeroerr.common.security.annotation.EnableRyFeignClients; +import com.zeroerr.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZeroErrRecruitApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrRecruitApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 招聘模块启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/EntryManageController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/EntryManageController.java new file mode 100644 index 0000000..9b2623c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/EntryManageController.java @@ -0,0 +1,162 @@ +package com.zeroerr.recruit.controller; + + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.recruit.domain.dto.EntryManagerDTO; +import com.zeroerr.recruit.domain.entity.EntryManage; +import com.zeroerr.recruit.domain.vo.EntryStatisticsVO; +import com.zeroerr.recruit.service.EntryManageService; +import com.zeroerr.recruit.service.ResumeFollowRecordService; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/recruit/entryManage") +@Api(tags = "招聘管理-入职管理") +public class EntryManageController extends BaseController { + + @Autowired + private EntryManageService entryManageService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private ResumeFollowRecordService resumeFollowRecordService; + + @RequiresPermissions("recruit:entry:add") + @PostMapping("/add") + @ApiOperation(value = "增加入职管理的记录") + public AjaxResult addEntryManage(@Validated @RequestBody EntryManage req) { + req.setHrId(SecurityUtils.getUserId()); + SysUser sysUser = iSysUserService.selectUserById(SecurityUtils.getUserId()); + req.setHrName(sysUser.getNickName()); + req.setCreateTime(LocalDateTime.now()); + return toAjax(entryManageService.save(req)); + } + + @RequiresPermissions("recruit:entry:edit") + @PutMapping("/edit") + @ApiOperation(value = "修改入职管理的记录") + public AjaxResult editEntryManage(@Validated @RequestBody EntryManage req) { + return toAjax(entryManageService.updateById(req)); + } + + @RequiresPermissions("@ss.hasAnyPermi('recruit:entry:edit')") + @GetMapping("/get/{entryId}") + @ApiOperation(value = "查询某个入职管理的记录") + public AjaxResult queryEntryManage(@PathVariable("entryId") String entryId) { + return AjaxResult.success(entryManageService.getById(entryId)); + } + + @RequiresPermissions("recruit:entry:list") + @GetMapping("/list") + @ApiOperation(value = "入职管理的记录列表") + public TableDataInfo listEntryManage(EntryManagerDTO req) { +// boolean isHr = false; +// List sysRoles = iSysRoleService.rolesByUserId(getUserId()); +// if (!CollectionUtils.isEmpty(sysRoles)) { +// for (SysRole sysRole : sysRoles) { +// //如果角色是hr +// if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { +// isHr = true; +// } +// } +// } +// if (isHr) { +// req.setHrId(getUserId()); +// } + startPage(); + List entryManageList = entryManageService.listBySelect(req); + return getDataTable(entryManageList); + } + + + @RequiresPermissions("recruit:entry:delete") + @DeleteMapping("/delete/{entryId}") + @ApiOperation(value = "删除某个入职管理的记录") + public AjaxResult deleteEntryManage(@PathVariable("entryId") String entryId) { + return toAjax(entryManageService.removeById(entryId)); + } + + + @PostMapping("/export") + @RequiresPermissions("'recruit:entry:export") + @ApiOperation(value = "下载入职管理记录") + @Log(title = "下载入职管理记录", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response, EntryManagerDTO req) { + List entryManageList = entryManageService.listBySelect(req); + //将序号重新排列 + for (int i = 0; i < entryManageList.size(); i++) { + EntryManage entry = entryManageList.get(i); + entry.setEntryId((long) i); + } + ExcelUtil util = new ExcelUtil(EntryManage.class); + util.exportExcel(response, entryManageList, "入职管理数据"); + + } + + + @GetMapping("/getStatistics/{year}") + @RequiresPermissions("recruit:entry:statistics") + @ApiOperation(value = "查看入职管理统计") + public AjaxResult getStatistics(@PathVariable("year") String year) { + EntryStatisticsVO entryStatisticsVO = new EntryStatisticsVO(); + List expectEntryCounts=new ArrayList<>(); + List confirmEntryCounts=new ArrayList<>(); + List refuseEntryCounts=new ArrayList<>(); + //找出所有该年份的入职信息,预计入职不为空的 + List entryList = entryManageService.listByYear(year); + //根据月份进行分组 + if (!CollectionUtils.isEmpty(entryList)) { + Map> listByMonth = entryList.stream().collect(Collectors.groupingBy(x -> x.getJoinDate().getMonthValue())); + //从1月份开始,因为防止有月份没有数据导致错乱。 + for(int month =1 ;month<=12 ;month++){ + List entryManageList = listByMonth.get(month); + //如果该月份有数据 + if(!CollectionUtils.isEmpty(entryManageList)){ + //统计该月份的预计入职人数 + expectEntryCounts.add(entryManageList.size()); + //统计该月份实际入职人数 + confirmEntryCounts.add((int) entryManageList.stream().filter(x -> x.getIsEntry().equals("1")).count()); + //统计该月份拒绝入职人数 + refuseEntryCounts.add((int) entryManageList.stream().filter(x -> x.getIsEntry().equals("0")).count()); + } + //如果该月份没有数据 + else { + expectEntryCounts.add(null); + confirmEntryCounts.add(null); + refuseEntryCounts.add(null); + } + } + } + + entryStatisticsVO.setExpectEntryCounts(expectEntryCounts); + entryStatisticsVO.setConfirmEntryCounts(confirmEntryCounts); + entryStatisticsVO.setRefuseEntryCounts(refuseEntryCounts); + return AjaxResult.success(entryStatisticsVO); + } +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/HomePageController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/HomePageController.java new file mode 100644 index 0000000..c53f16a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/HomePageController.java @@ -0,0 +1,897 @@ +package com.zeroerr.recruit.controller; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.metadata.style.WriteFont; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.nacos.shaded.com.google.common.collect.Lists; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.recruit.domain.dto.AnnouncementDTO; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.dto.HomePageDTO; +import com.zeroerr.recruit.domain.dto.PostDetailDTO; +import com.zeroerr.recruit.domain.entity.EntryManage; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.domain.entity.ResumeFollowRecord; +import com.zeroerr.recruit.domain.entity.ResumeHandleRecord; +import com.zeroerr.recruit.domain.vo.PostListVO; +import com.zeroerr.recruit.domain.vo.ResumeStatVO; +import com.zeroerr.recruit.service.*; +import com.zeroerr.system.service.RecruitStructureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.net.URLEncoder; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.*; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/home") +@Api(tags = "首页") +public class HomePageController extends BaseController { + + @Autowired + private ResumeFollowRecordService resumeFollowRecordService; + @Autowired + private PostPlanFollowService postPlanFollowService; + @Autowired + private RecruitProcessTaskService recruitProcessTaskService; + @Autowired + private ResumeHandleRecordService resumeHandleRecordService; + @Autowired + private RecruitStructureService recruitStructureService; + @Autowired + private EntryManageService entryManageService; + @Autowired + private PostGradeService postGradeService; + + + @GetMapping("/getResumeStat") + @ApiOperation(value = "获取简历分析数据") + public AjaxResult getResumeStat(HomePageDTO req) { + // 给定的年月 + String yearMonthStr = req.getMonth(); + // 解析年月字符串 + YearMonth yearMonth = YearMonth.parse(yearMonthStr); + // 获取该月份的第一天 + LocalDate firstDay = yearMonth.atDay(1); + // 获取该月份的最后一天 + LocalDate lastDay = yearMonth.atEndOfMonth(); + //根据条件筛选<面试跟踪> + List resumeFollowRecordList = resumeFollowRecordService.getBySelect(req.getHrId(), firstDay, lastDay); + //寻找《看过简历数》 + List resumeHandleRecordList = resumeHandleRecordService.getBySelect(req.getHrId(), firstDay, lastDay); + + //寻找该月份实际到面的人数 + List resumeFollowRecordActualArrivedList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 0); + + //寻找该月份终试通过人数 + List resumeFollowRecordFinalPassList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 1); + + //寻找该月份实际入职人数(以入职管理里的为准) + //List resumeFollowRecordActualEntryList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 2); + List entryManageList = entryManageService.getList(firstDay, lastDay); + + //寻找该月份初试通过人数 + List resumeFollowRecordFirstPassList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 3); + + //寻找该月份的终试数 + List resumeFollowRecordFinalArrivedList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 5); + + //寻找该月份接受的offer数 + List resumeFollowRecordOfferList = resumeFollowRecordService.getBySelectMonth(req.getHrName(), firstDay, lastDay, 6); + + + ResumeStatVO resumeStatVO = new ResumeStatVO(); + //1.合格简历数量 + resumeStatVO.setQualifiedCount(resumeFollowRecordList.size()); + //2 .初试通过人数 + resumeStatVO.setFistCount(resumeFollowRecordFirstPassList.stream().filter(record -> "1".equals(record.getFirstPass())).count()); + //3.通过人数(终面) + resumeStatVO.setFinalPassCount(resumeFollowRecordFinalPassList.stream().filter(record -> "1".equals(record.getFinalPass())).count()); + //4.未通过人数(终面) + resumeStatVO.setFinalFailCount(resumeFollowRecordList.stream().filter(record -> "0".equals(record.getFinalPass())).count()); + //5.入职人数("实际"入职日期不为空的数据统计) + resumeStatVO.setEntryCount(entryManageList.size()); + //6.简历来源:下载 + resumeStatVO.setDownLoadCounts(resumeFollowRecordList.stream().filter(record -> "2".equals(record.getResumeSource())).count()); + //7.简历处理-自投 + if (resumeHandleRecordList != null) { + resumeStatVO.setSelfCounts(resumeHandleRecordList.stream() + .filter(record -> record.getSelfCounts() != null) + .mapToInt(ResumeHandleRecord::getSelfCounts) + .sum()); + } else { + resumeStatVO.setSelfCounts(0); + } + //8.封装实际到面人数 + resumeStatVO.setActualArriveCounts(resumeFollowRecordActualArrivedList.stream().filter(record -> "1".equals(record.getFirstReach())).count()); + //9.通过比例(终面)=通过人数(终面)/初面实际到面人数 + //long totalCount = resumeStatVO.getFinalPassCount() + resumeStatVO.getFinalFailCount(); + if (resumeStatVO.getActualArriveCounts() != null) { + if (resumeStatVO.getActualArriveCounts() != 0L) { + BigDecimal passPercentage = new BigDecimal(resumeStatVO.getFinalPassCount()).divide(new BigDecimal(resumeStatVO.getActualArriveCounts()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + resumeStatVO.setPassPercent(passPercentage.doubleValue()); + } else { + resumeStatVO.setPassPercent(0d); + } + } + //10.入职比例=入职人数/初面实际到面人数 + if (resumeStatVO.getActualArriveCounts() != null) { + if (resumeStatVO.getActualArriveCounts() != 0L) { + BigDecimal entryPercentage = new BigDecimal(resumeStatVO.getEntryCount()).divide(new BigDecimal(resumeStatVO.getActualArriveCounts()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + resumeStatVO.setEntryPercent(entryPercentage.doubleValue()); + } + } else { + resumeStatVO.setEntryPercent(0d); + } + + + // 对resumeFollowRecordList根据postId进行分组 + Map> groupedResumeFollowRecords = resumeFollowRecordList.stream() + .collect(Collectors.groupingBy(ResumeFollowRecord::getPostId)); + + // 对resumeHandleRecordList根据postId进行分组 + Map> groupedResumeHandleRecords = resumeHandleRecordList.stream() + .collect(Collectors.groupingBy(ResumeHandleRecord::getPostId)); + + // 使用Set集合来收集和去重postId + Set uniquePostIds = new HashSet<>(); + // 将resumeFollowRecordList中的postId添加到Set中 + uniquePostIds.addAll(resumeFollowRecordList.stream() + .map(ResumeFollowRecord::getPostId) + .collect(Collectors.toList())); + // 将resumeHandleRecordList中的postId添加到Set中 + uniquePostIds.addAll(resumeHandleRecordList.stream() + .map(ResumeHandleRecord::getPostId) + .collect(Collectors.toList())); + + List postDetailDTOList = new ArrayList<>(); + + // 将Set转换为List + List uniquePostIdList = new ArrayList<>(uniquePostIds); + + //某月份,某岗位查看简历数 + List postLookResumeCounts = new ArrayList<>(); + //某月份,某岗位合格简历数 + List postQualifiedResumeCounts = new ArrayList<>(); + //某月份,某岗位简历自投数 + List postSelfCounts = new ArrayList<>(); + //某月份,某岗位简历下载数 + List postDownLoadCounts = new ArrayList<>(); + //某月份,某岗位约面人数 + List postInviteCounts = new ArrayList<>(); + //某月份,某岗位到面(初试)人数 + List postArriveCounts = new ArrayList<>(); + //某月份,某岗位的终试人数 + List postFinalCounts = new ArrayList<>(); + //某月份,某岗位接受offer数 + List postOfferCounts = new ArrayList<>(); + //某月份,某岗位的入职数 + List postEntryCounts = new ArrayList<>(); + //某月份,岗位名字 + List postNameList = new ArrayList<>(); + //某月份,岗位ids + List postIdsList = new ArrayList<>(); + //筛除已经招聘到的岗位 + //List postIdList=recruitStructureService.filterByPostIdList(uniquePostIdList); + if (!CollectionUtils.isEmpty(uniquePostIdList)) { + uniquePostIdList.forEach( + uniquePostId -> { + List resumeFollowRecordListByPostId = groupedResumeFollowRecords.get(uniquePostId); + List resumeHandleRecordListByPostId = groupedResumeHandleRecords.get(uniquePostId); + PostDetailDTO postDetailDTO = new PostDetailDTO(); + postDetailDTO.setPostId(uniquePostId); + //封装岗位名字 + if (!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)) { + postDetailDTO.setPostName(resumeFollowRecordListByPostId.get(0).getPostName()); + } else if (!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)) { + postDetailDTO.setPostName(resumeHandleRecordListByPostId.get(0).getPostName()); + } else { + postDetailDTO.setPostName(""); + } + + //封装该岗位浏览简历数 + if (!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)) { + postDetailDTO.setPostLookResumeCounts(resumeHandleRecordListByPostId.stream() + .mapToInt(ResumeHandleRecord::getSeenNum) + .sum()); + } else { + postDetailDTO.setPostLookResumeCounts(0); + } + + //封装该岗位合格简历数 + if (!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)) { +// postDetailDTO.setPostQualifiedResumeCounts( resumeHandleRecordListByPostId.stream() +// .mapToInt(ResumeHandleRecord::getQualifiedNum) +// .sum()); + postDetailDTO.setPostQualifiedResumeCounts(resumeFollowRecordListByPostId.size()); + } else { + postDetailDTO.setPostQualifiedResumeCounts(0); + } + + //封装该岗位的自投数 +// if (!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)) { +// postDetailDTO.setPostSelfCounts(resumeFollowRecordListByPostId.stream().filter(record -> Objects.nonNull(record.getResumeSource()) && "1".equals(record.getResumeSource())).count()); +// } else { +// postDetailDTO.setPostSelfCounts(0L); +// } + //封装该岗位的自投数 + if (!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)) { + postDetailDTO.setPostSelfCounts(resumeHandleRecordListByPostId.stream() + .filter(record -> record.getSelfCounts() != null) // 过滤掉getSelfCounts为空的记录 + .mapToInt(ResumeHandleRecord::getSelfCounts) + .sum()); + } else { + postDetailDTO.setPostSelfCounts(0); + } + + //封装该岗位的下载数 + if (!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)) { + postDetailDTO.setPostDownLoadCounts(resumeFollowRecordListByPostId.stream().filter(record -> Objects.nonNull(record.getResumeSource()) && "2".equals(record.getResumeSource())).count()); + } else { + postDetailDTO.setPostDownLoadCounts(0L); + } + + //封装约面数 + if (!CollectionUtils.isEmpty(resumeHandleRecordListByPostId)) { + postDetailDTO.setPostInviteCounts(resumeHandleRecordListByPostId.stream() + .mapToInt(ResumeHandleRecord::getReceiveInviteNum) + .sum()); + } else { + postDetailDTO.setPostInviteCounts(0); + } + +// //封装到面数 +// if (!CollectionUtils.isEmpty(resumeFollowRecordListByPostId)) { +// postDetailDTO.setPostArriveCounts(resumeFollowRecordListByPostId.stream().filter(record -> Objects.nonNull(record.getFirstReach()) && "1".equals(record.getFirstReach())).count()); +// } else { +// postDetailDTO.setPostArriveCounts(0L); +// } + postDetailDTOList.add(postDetailDTO); + } + ); + if (!CollectionUtils.isEmpty(postDetailDTOList)) { + //根据合格简历数多少进行排序 + List sortedList = postDetailDTOList.stream() + .sorted(Comparator.comparingInt(PostDetailDTO::getPostQualifiedResumeCounts).reversed()) // 从大到小排序 + .collect(Collectors.toList()); + sortedList.forEach( + post -> { + postIdsList.add(post.getPostId()); + postNameList.add(post.getPostName()); + //postArriveCounts.add(post.getPostArriveCounts()); + postInviteCounts.add(post.getPostInviteCounts()); + postDownLoadCounts.add(post.getPostDownLoadCounts()); + postSelfCounts.add(post.getPostSelfCounts()); + postQualifiedResumeCounts.add(post.getPostQualifiedResumeCounts()); + postLookResumeCounts.add(post.getPostLookResumeCounts()); + } + ); + } + } + + resumeStatVO.setPostLookResumeCounts(postLookResumeCounts); + resumeStatVO.setPostQualifiedResumeCounts(postQualifiedResumeCounts); + resumeStatVO.setPostSelfCounts(postSelfCounts); + resumeStatVO.setPostDownLoadCounts(postDownLoadCounts); + resumeStatVO.setPostInviteCounts(postInviteCounts); + //resumeStatVO.setPostArriveCounts(postArriveCounts); + resumeStatVO.setPostNameList(postNameList); + resumeStatVO.setPostIdsList(postIdsList); + + //根据postIdsList,封装里面每个岗位的到面数(初试数)、终试数、入职数。 + if (!CollectionUtils.isEmpty(postIdsList)) { + postIdsList.forEach( + postId -> { + //寻找该岗位该月份的实际到面人数(初面人数) + List filteredFirstReachList = resumeFollowRecordActualArrivedList.stream() + .filter(record -> record.getPostId().equals(postId)) + .collect(Collectors.toList()); + postArriveCounts.add(filteredFirstReachList.size()); + //寻找该岗位的终试人数 + List filteredFinalReachList = resumeFollowRecordFinalArrivedList.stream() + .filter(record -> record.getPostId().equals(postId)) + .collect(Collectors.toList()); + postFinalCounts.add(filteredFinalReachList.size()); + //寻找该岗位的入职人数 +// List filteredEntryReachList = entryManageList.stream() +// .filter(record -> record.getPostId().equals(postId)) +// .collect(Collectors.toList()); +// postEntryCounts.add(filteredEntryReachList.size()); + } + ); + } + resumeStatVO.setPostArriveCounts(postArriveCounts); + resumeStatVO.setPostFinalCounts(postFinalCounts); + resumeStatVO.setPostEntryCounts(postEntryCounts); + + + List funnelDataList = new ArrayList<>(); + + //找到所有时间一共有多少份录入的简历 + List allResumeFollowRecordList = resumeFollowRecordService.list(); + //找到所有时间一共有多少人实际入职 + List allEntryManageList = entryManageService.getList(null, null); + + //封装合格简历 + funnelDataList.add(new ResumeStatVO.FunnelData().setName("合格简历:" + allResumeFollowRecordList.size() + "人").setValue((long) allResumeFollowRecordList.size())); + //封装电话面试通过百分比 + //通过电话面试的人数 + //通过 + long phonePassCount1 = allResumeFollowRecordList.stream().filter(record -> "1".equals(record.getIsPass())).count(); + //直接邀约 + long phonePassCount2 = allResumeFollowRecordList.stream().filter(record -> "4".equals(record.getIsPass())).count(); + long phonePassCount = phonePassCount1 + phonePassCount2; + funnelDataList.add(new ResumeStatVO.FunnelData().setName("电面通过:" + phonePassCount + "人").setValue(phonePassCount)); + + //封装到面人数 + long arrivedCount = allResumeFollowRecordList.stream().filter(record -> "1".equals(record.getFirstReach())).count(); + funnelDataList.add(new ResumeStatVO.FunnelData().setName("到面人数:" + arrivedCount + "人").setValue(arrivedCount)); + + //封装初试通过百分比 + long firstReachCount = allResumeFollowRecordList.stream().filter(record -> "1".equals(record.getFirstPass())).count(); + + funnelDataList.add(new ResumeStatVO.FunnelData().setName("初试通过:" + firstReachCount + "人").setValue(firstReachCount)); + + long finalPassCount = allResumeFollowRecordList.stream().filter(record -> "1".equals(record.getFinalPass())).count(); + //封装终试通过人数 + funnelDataList.add(new ResumeStatVO.FunnelData().setName("终试通过:" + finalPassCount + "人").setValue(finalPassCount)); + + //封装入职人数 + funnelDataList.add(new ResumeStatVO.FunnelData().setName("入职通过:" + allEntryManageList.size() + "人").setValue((long) allEntryManageList.size())); + resumeStatVO.setFunnelData(funnelDataList); + + //查询待我审批的条数 + List waitProcessList = recruitProcessTaskService.listPending(new RecruitProcessTask(), SecurityUtils.getUserId()); + + //查询我已审批条数 + List haveProcessList = recruitProcessTaskService.listApproved(new RecruitProcessTask(), SecurityUtils.getUserId()); + + //查询我的申请条数 + RecruitProcessTask recruitProcessTask1 = new RecruitProcessTask(); + recruitProcessTask1.setUserDeptId(SecurityUtils.getLoginUser().getDeptId()); + List myProcessList = recruitProcessTaskService.list(recruitProcessTask1, SecurityUtils.getUserId()); + + //查询待我招聘条数 + RecruitProcessTask recruitProcessTask = new RecruitProcessTask(); + recruitProcessTask.setUserId(SecurityUtils.getUserId()); + List taskList = recruitProcessTaskService.listMyPost(recruitProcessTask); + + if (!CollectionUtils.isEmpty(waitProcessList)) { + resumeStatVO.setWaitProcess(waitProcessList.size()); + } else { + resumeStatVO.setWaitProcess(0); + } + + if (!CollectionUtils.isEmpty(haveProcessList)) { + resumeStatVO.setHaveProcess(haveProcessList.size()); + } else { + resumeStatVO.setHaveProcess(0); + } + + if (!CollectionUtils.isEmpty(myProcessList)) { + resumeStatVO.setMyProcess(myProcessList.size()); + } else { + resumeStatVO.setMyProcess(0); + } + + if (!CollectionUtils.isEmpty(taskList)) { + resumeStatVO.setWaitRecruit(taskList.size()); + } else { + resumeStatVO.setWaitRecruit(0); + } + + + if (!CollectionUtils.isEmpty(resumeHandleRecordList)) { + //封装找简历数 + resumeStatVO.setFindResumeCounts(resumeHandleRecordList.stream().mapToInt(ResumeHandleRecord::getSeenNum).sum()); + //封装约面人数 + resumeStatVO.setInvestInterviewCounts(resumeHandleRecordList.stream().mapToInt(ResumeHandleRecord::getReceiveInviteNum).sum()); + } else { + resumeStatVO.setFindResumeCounts(0); + } + //封装到面率=实际到面人数/约面人数 + if (resumeStatVO.getInvestInterviewCounts() != null) { + if (resumeStatVO.getInvestInterviewCounts() != 0) { + double percentage = (resumeStatVO.getActualArriveCounts().doubleValue() / resumeStatVO.getInvestInterviewCounts().doubleValue()) * 100; + String formattedPercentage = String.format("%.2f%%", percentage); + double percentageValueFromString = Double.parseDouble(formattedPercentage.substring(0, formattedPercentage.length() - 1)); + resumeStatVO.setArrivePercent(percentageValueFromString); + } + } else { + resumeStatVO.setArrivePercent(0d); + } + + //封装简历合格率 + Integer total = resumeStatVO.getFindResumeCounts() + resumeStatVO.getSelfCounts(); + if (resumeStatVO.getQualifiedCount() != null && total != 0) { + double percentage = (resumeStatVO.getQualifiedCount().doubleValue() / total.doubleValue()) * 100; + String formattedPercentage = String.format("%.2f%%", percentage); + double percentageValueFromString = Double.parseDouble(formattedPercentage.substring(0, formattedPercentage.length() - 1)); + resumeStatVO.setQualifiedPercent(percentageValueFromString); + } else { + resumeStatVO.setQualifiedPercent(0d); + } + //封装约面率 + if (resumeStatVO.getInvestInterviewCounts() != null && resumeStatVO.getQualifiedCount() != null) { + if (resumeStatVO.getQualifiedCount() != 0) { + double percentage = (resumeStatVO.getInvestInterviewCounts().doubleValue() / resumeStatVO.getQualifiedCount().doubleValue()) * 100; + String formattedPercentage = String.format("%.2f%%", percentage); + double percentageValueFromString = Double.parseDouble(formattedPercentage.substring(0, formattedPercentage.length() - 1)); + resumeStatVO.setInvitePercent(percentageValueFromString); + } + } else { + resumeStatVO.setInvitePercent(0d); + } + return success(resumeStatVO); + } + + + @GetMapping("/getRecruitingPost") + @ApiOperation(value = "获取简历分析数据") + public AjaxResult getRecruitingPost() { + FollowDTO followDTO = new FollowDTO(); + // 获取当前日期 + LocalDate now = LocalDate.now(); + // 获取当前月份的第一天 + LocalDate firstDayOfMonth = now.with(TemporalAdjusters.firstDayOfMonth()); + followDTO.setStartDate(firstDayOfMonth); + followDTO.setEndDate(LocalDate.now()); + List resumeHandleRecordList = resumeHandleRecordService.listBySelect(followDTO); + List postListVOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(resumeHandleRecordList)) { + List uniqueRecords = new ArrayList<>(resumeHandleRecordList.stream() + .collect(Collectors.toMap(ResumeHandleRecord::getPostId, record -> record, (existing, replacement) -> existing)) + .values()); + uniqueRecords.forEach( + resumeHandleRecord -> { + PostListVO postListVO = new PostListVO(); + postListVO.setPostId(resumeHandleRecord.getPostId()); + postListVO.setPostName(resumeHandleRecord.getPostName()); + postListVOList.add(postListVO); + } + ); + } + return AjaxResult.success(postListVOList); + } + + + @GetMapping("/getAnnouncement") + @ApiOperation(value = "获取公告数据") + public AjaxResult getAnnouncement() { + //封装公告内容 + List announcementDTOList = new ArrayList<>(); + + // 获取从昨天开始的近七天的日期范围 + LocalDate yesterday = LocalDate.now().plusDays(-1); + LocalDate plusDays = yesterday.plusDays(7); + + // 获取近七天预计入职的人,并按时间分类 + Map> groupByJoinDate = entryManageService.getListByWeek(yesterday, plusDays) + .stream().collect(Collectors.groupingBy(EntryManage::getJoinDate)); + + // 获取近七天将要初试的人,并按时间分类 + List resumeFollowRecordList1 = resumeFollowRecordService.getFirstInterviewList(yesterday, plusDays); + Map> collect1 = resumeFollowRecordList1.stream().collect(Collectors.groupingBy(record -> record.getFirstDate().toLocalDate())); + + // 获取近七天将要终试的人,并按时间分类 + List resumeFollowRecordList2 = resumeFollowRecordService.getFinalInterviewList(yesterday, plusDays); + Map> collect2 = resumeFollowRecordList2.stream().collect(Collectors.groupingBy(record -> record.getFinalDate().toLocalDate())); + + // 获取近七天将要初试/终试的人,并按时间分类 + List resumeFollowRecordList3 = resumeFollowRecordService.getFirstAndFinalInterviewList(yesterday, plusDays); + Map> collect3 = resumeFollowRecordList3.stream().collect(Collectors.groupingBy(record -> record.getFirstDate().toLocalDate())); + + // 处理初试 + processAnnouncements(announcementDTOList, collect1, plusDays, "first"); + + // 处理终试 + processAnnouncements(announcementDTOList, collect2, plusDays, "final"); + + // 处理初/终试 + processAnnouncements(announcementDTOList, collect3, plusDays, "mix"); + + // 处理预计入职的公告 + processAnnouncements(announcementDTOList, groupByJoinDate, plusDays, "entry"); + + // 按日期排序 + announcementDTOList.sort(Comparator.comparing(AnnouncementDTO::getDate)); + //获取到每个List announcementDTOList 里的 AnnouncementDTO 的private List announcementInterviewList;,announcementInterviewList的interviewTime字段进行时间排序 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm"); + + for (AnnouncementDTO announcement : announcementDTOList) { + List interviewList = announcement.getAnnouncementInterviewList(); + if (interviewList != null) { + Collections.sort(interviewList, Comparator.comparing(interview -> LocalTime.parse(interview.getInterviewTime(), formatter))); + } + + } + return AjaxResult.success(announcementDTOList); + } + + private void processAnnouncements(List announcementDTOList, Map> groupedData, LocalDate plusDay, String tip) { + int count = 1; + for (Map.Entry> entry : groupedData.entrySet()) { + LocalDate date = entry.getKey(); + List dataList = entry.getValue(); + //如果是处理面试的人 + if (!tip.equals("entry")) { + //找announcementDTOList有没有同一天的,如果有,则在该数据集里处理数据,如果没有就新建 + Optional result = announcementDTOList.stream() + .filter(announcement -> date.equals(announcement.getDate())) + .findFirst(); + //如果存在则 + AnnouncementDTO announcementDTO; + List nodeList = new ArrayList<>(); + if (result.isPresent()) { + announcementDTO = result.get(); + nodeList = handleNodeList(dataList, tip); + announcementDTO.getAnnouncementInterviewList().addAll(nodeList); + // announcementDTO更新回去 + for (int i = 0; i < announcementDTOList.size(); i++) { + if (announcementDTOList.get(i).getDate().equals(announcementDTO.getDate())) { + announcementDTOList.set(i, announcementDTO); + break; + } + } + } else { + announcementDTO = new AnnouncementDTO(); + announcementDTO.setId(count++); + announcementDTO.setDate(date); + nodeList = handleNodeList(dataList, tip); + announcementDTO.setAnnouncementInterviewList(nodeList); + announcementDTOList.add(announcementDTO); + } + } + //如果是处理预计入职的人 + else { + //先找找announcementDTOList有没有同一天的 + Optional existingAnnouncement = announcementDTOList.stream() + .filter(announcement -> date.equals(announcement.getDate())) + .findFirst(); + //如果存在则取出来封装入职人的信息 + if (existingAnnouncement.isPresent()) { + AnnouncementDTO announcementDTO = existingAnnouncement.get(); + List announcementEntryList = new ArrayList<>(); + for (T data : dataList) { + AnnouncementDTO.AnnouncementEntry announcementEntry = new AnnouncementDTO.AnnouncementEntry(); + EntryManage entryManage = (EntryManage) data; + announcementEntry.setEntryName(entryManage.getUserName()); + announcementEntry.setEntryPostName(entryManage.getPostName()); + announcementEntry.setEntryDept(entryManage.getDeptName()); + announcementEntry.setEntryHrName(entryManage.getHrName()); + announcementEntryList.add(announcementEntry); + } + announcementDTO.setAnnouncementEntryList(announcementEntryList); + + // announcementDTO更新回去 + for (int i = 0; i < announcementDTOList.size(); i++) { + if (announcementDTOList.get(i).getDate().equals(announcementDTO.getDate())) { + announcementDTOList.set(i, announcementDTO); + break; + } + } + } + //如果不存在,则新增所有数据 + else { + AnnouncementDTO announcementDTO = new AnnouncementDTO(); + announcementDTO.setId(count++); + announcementDTO.setDate(date); + List announcementEntryList = new ArrayList<>(); + for (T data : dataList) { + AnnouncementDTO.AnnouncementEntry announcementEntry = new AnnouncementDTO.AnnouncementEntry(); + EntryManage entryManage = (EntryManage) data; + announcementEntry.setEntryName(entryManage.getUserName()); + announcementEntry.setEntryPostName(entryManage.getPostName()); + announcementEntry.setEntryDept(entryManage.getDeptName()); + announcementEntry.setEntryHrName(entryManage.getHrName()); + announcementEntryList.add(announcementEntry); + } + announcementDTO.setAnnouncementEntryList(announcementEntryList); + announcementDTOList.add(announcementDTO); + } + } + } + } + + private List handleNodeList(List dataList, String tip) { + List nodeList = new ArrayList<>(); + for (T data : dataList) { + AnnouncementDTO.AnnouncementInterview announcementNode = new AnnouncementDTO.AnnouncementInterview(); + ResumeFollowRecord resumeFollowRecord = (ResumeFollowRecord) data; + //填入某日期内某个面试候选人的姓名 + announcementNode.setInterviewName(resumeFollowRecord.getName()); + //填入某日期内某个面试候选人的岗位 + announcementNode.setInterviewPostName(resumeFollowRecord.getPostName()); + //填入某日期内某个面试候选人的岗位负责招聘的hr + announcementNode.setInterviewHrName(resumeFollowRecord.getHrName()); + if (resumeFollowRecord.getFirstPass() != null) { + if (resumeFollowRecord.getFirstPass().equals("1")) { + announcementNode.setInterviewFirstResult("通过"); + } else if (resumeFollowRecord.getFirstPass().equals("0")) { + announcementNode.setInterviewFirstResult("淘汰"); + } else if (resumeFollowRecord.getFirstPass().equals("2")) { + announcementNode.setInterviewFirstResult("待定"); + } + //如果初试有日期,但是未到面,则视为放弃 + + } else if (resumeFollowRecord.getFirstDate() != null && resumeFollowRecord.getFirstReach() != null) { + if (resumeFollowRecord.getFirstReach().equals("0")) { + announcementNode.setInterviewFirstResult("放弃"); + } + } + if (resumeFollowRecord.getFinalPass() != null) { + if (resumeFollowRecord.getFinalPass().equals("1")) { + announcementNode.setInterviewFinalResult("通过"); + } else if (resumeFollowRecord.getFinalPass().equals("0")) { + announcementNode.setInterviewFinalResult("淘汰"); + } else if (resumeFollowRecord.getFinalPass().equals("2")) { + announcementNode.setInterviewFinalResult("待定"); + } else if (resumeFollowRecord.getFinalDate() != null) { + if (resumeFollowRecord.getFinalReach().equals("0") || resumeFollowRecord.getFinalReach().isEmpty()) { + announcementNode.setInterviewFinalResult("放弃"); + } + } + } + + if (resumeFollowRecord.getIsAttend() != null) { + if (resumeFollowRecord.getIsAttend().equals("1")) { + announcementNode.setIsAttend("参与"); + } else if (resumeFollowRecord.getIsAttend().equals("0")) { + announcementNode.setIsAttend("不参与"); + } else if (resumeFollowRecord.getIsAttend().equals("2")) { + announcementNode.setIsAttend("待定"); + } + } + if (resumeFollowRecord.getManagerTime() != null) { + announcementNode.setManagerTime(resumeFollowRecord.getManagerTime().toLocalTime().toString()); + } + + if (tip.equals("first")) { + //面试-时间 + announcementNode.setInterviewTime(getFormattedTime(resumeFollowRecord.getFirstDate())); + //面试-状态 + announcementNode.setInterviewType("初试"); + } else if (tip.equals("final")) { + //面试-时间 + announcementNode.setInterviewTime(getFormattedTime(resumeFollowRecord.getFinalDate())); + //面试-状态 + announcementNode.setInterviewType("终试"); + } else if (tip.equals("mix")) { + //面试-时间 + announcementNode.setInterviewTime(getFormattedTime(resumeFollowRecord.getFirstDate())); + //面试-状态 + announcementNode.setInterviewType("初/终试"); + } + nodeList.add(announcementNode); + } + return nodeList; + } + + private String getFormattedTime(LocalDateTime dateTime) { + DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm"); + return dateTime.format(timeFormatter); + } + + private List> head1() { + List> headTitles = Lists.newArrayList(); + headTitles.add(Lists.newArrayList("面试候选人", "日期")); + headTitles.add(Lists.newArrayList("面试候选人", "时间")); + headTitles.add(Lists.newArrayList("面试候选人", "姓名")); + headTitles.add(Lists.newArrayList("面试候选人", "状态")); + headTitles.add(Lists.newArrayList("面试候选人", "岗位")); + headTitles.add(Lists.newArrayList("面试候选人", "招聘HR")); + headTitles.add(Lists.newArrayList("面试候选人", "初试结果")); + headTitles.add(Lists.newArrayList("面试候选人", "终试结果")); + headTitles.add(Lists.newArrayList("面试候选人", "总经理预计面试时间")); + return headTitles; + } + + + private List> head2() { + List> headTitles = Lists.newArrayList(); + headTitles.add(Lists.newArrayList("预计入职候选人", "日期")); + headTitles.add(Lists.newArrayList("预计入职候选人", "姓名")); + headTitles.add(Lists.newArrayList("预计入职候选人", "部门")); + headTitles.add(Lists.newArrayList("预计入职候选人", "岗位")); + headTitles.add(Lists.newArrayList("预计入职候选人", "招聘HR")); + return headTitles; + } + + private static HorizontalCellStyleStrategy setConfigure() { + // 头的策略 + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + // 背景色 + headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE1.getIndex()); + WriteFont headWriteFont = new WriteFont(); + // 加粗/**/ + headWriteFont.setBold(true); + headWriteFont.setFontHeightInPoints((short) 14); // 设置行高,不重要 + headWriteCellStyle.setWriteFont(headWriteFont); + //headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT); + headWriteCellStyle.setShrinkToFit(true); + + // 内容的策略 + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + // 字体策略 + WriteFont contentWriteFont = new WriteFont(); + // 字体大小 +// contentWriteFont.setFontHeightInPoints((short) 14); + contentWriteCellStyle.setWriteFont(contentWriteFont); + //边框 + //导出数据垂直居中 + contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + //导出数据水平居中 + contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); + contentWriteCellStyle.setBorderLeft(BorderStyle.NONE); + contentWriteCellStyle.setBorderTop(BorderStyle.NONE); + contentWriteCellStyle.setBorderRight(BorderStyle.NONE); + contentWriteCellStyle.setBorderBottom(BorderStyle.NONE); + + //设置 自动换行 + contentWriteCellStyle.setWrapped(true); + //设置 + // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现 + return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + } + + @PostMapping("/export") + @ApiOperation(value = "下载近日事项") + @Log(title = "下载入职管理记录", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response) throws IOException { + + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + String fileName = URLEncoder.encode("近日事项","UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List> interviewData=new ArrayList<>(); + List> entryData=new ArrayList<>(); + handleData(interviewData,entryData); + try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()) + .registerWriteHandler(setConfigure()) + //.registerWriteHandler(new CustomCellWriteHandler()) + .build()) { + //第一个sheet + WriteSheet writeSheet = EasyExcel.writerSheet(0, "面试候选人").build(); + writeSheet.setHead(head1()); + excelWriter.write(interviewData, writeSheet); + + //第二个sheet... + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "预计入职候选人").build(); + writeSheet2.setHead(head2()); + excelWriter.write(entryData, writeSheet2); + + } catch (Exception e) { + System.out.println(e.getMessage()); + } + } + + + public void handleData(List> interviewData ,List> entryData){ + //封装公告内容 + List announcementDTOList = new ArrayList<>(); + + // 获取从昨天开始的近七天的日期范围 + LocalDate yesterday = LocalDate.now().plusDays(-1); + LocalDate plusDays = yesterday.plusDays(7); + + // 获取近七天预计入职的人,并按时间分类 + Map> groupByJoinDate = entryManageService.getListByWeek(yesterday, plusDays) + .stream().collect(Collectors.groupingBy(EntryManage::getJoinDate)); + + // 获取近七天将要初试的人,并按时间分类 + List resumeFollowRecordList1 = resumeFollowRecordService.getFirstInterviewList(yesterday, plusDays); + Map> collect1 = resumeFollowRecordList1.stream().collect(Collectors.groupingBy(record -> record.getFirstDate().toLocalDate())); + + // 获取近七天将要终试的人,并按时间分类 + List resumeFollowRecordList2 = resumeFollowRecordService.getFinalInterviewList(yesterday, plusDays); + Map> collect2 = resumeFollowRecordList2.stream().collect(Collectors.groupingBy(record -> record.getFinalDate().toLocalDate())); + + // 获取近七天将要初试/终试的人,并按时间分类 + List resumeFollowRecordList3 = resumeFollowRecordService.getFirstAndFinalInterviewList(yesterday, plusDays); + Map> collect3 = resumeFollowRecordList3.stream().collect(Collectors.groupingBy(record -> record.getFirstDate().toLocalDate())); + + // 处理初试 + processAnnouncements(announcementDTOList, collect1, plusDays, "first"); + + // 处理终试 + processAnnouncements(announcementDTOList, collect2, plusDays, "final"); + + // 处理初/终试 + processAnnouncements(announcementDTOList, collect3, plusDays, "mix"); + + // 处理预计入职的公告 + processAnnouncements(announcementDTOList, groupByJoinDate, plusDays, "entry"); + + // 按日期排序 + announcementDTOList.sort(Comparator.comparing(AnnouncementDTO::getDate)); + //获取到每个List announcementDTOList 里的 AnnouncementDTO 的private List announcementInterviewList;,announcementInterviewList的interviewTime字段进行时间排序 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm"); + + List list1 = new ArrayList<>(); + List list2 = new ArrayList<>(); + for (AnnouncementDTO announcement : announcementDTOList) { + List interviewList = announcement.getAnnouncementInterviewList(); + List entryList = announcement.getAnnouncementEntryList(); + if (interviewList != null) { + Collections.sort(interviewList, Comparator.comparing(interview -> LocalTime.parse(interview.getInterviewTime(), formatter))); + interviewList.forEach( + x -> { + x.setDate(announcement.getDate().toString()); + } + ); + list1.addAll(interviewList); + } + if (entryList != null) { + entryList.forEach( + x -> { + x.setDate(announcement.getDate().toString()); + } + ); + list2.addAll(entryList); + } + } + + if(!CollectionUtils.isEmpty(list1)){ + list1.forEach( + x->{ + List element=new ArrayList<>(); + element.add(x.getDate()); + element.add(x.getInterviewTime()); + element.add(x.getInterviewName()); + element.add(x.getInterviewType()); + element.add(x.getInterviewPostName()); + element.add(x.getInterviewHrName()); + element.add(x.getInterviewFirstResult()); + element.add(x.getInterviewFinalResult()); + element.add(x.getManagerTime()); + interviewData.add(element); + } + ); + } + + if(!CollectionUtils.isEmpty(list2)){ + list2.forEach( + x->{ + List element=new ArrayList<>(); + element.add(x.getDate()); + element.add(x.getEntryName()); + element.add(x.getEntryDept()); + element.add(x.getEntryPostName()); + element.add(x.getEntryHrName()); + entryData.add(element); + } + ); + } + + + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitFollowController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitFollowController.java new file mode 100644 index 0000000..e2baca1 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitFollowController.java @@ -0,0 +1,609 @@ +package com.zeroerr.recruit.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.entity.*; +import com.zeroerr.recruit.domain.vo.FollowVO; +import com.zeroerr.recruit.service.*; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.service.ISysUserService; +import com.zeroerr.system.service.RecruitStructureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/recruit/process") +@Api(tags = "招聘管理-任务跟踪") +public class RecruitFollowController extends BaseController { + @Autowired + private RecruitPostService recruitPostService; + + @Autowired + private RecruitStructureService recruitStructureService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private PostPlanFollowService postPlanFollowService; + + @Autowired + private ResumeHandleRecordService resumeHandleRecordService; + + @Autowired + private RecruitProcessTaskService recruitProcessTaskService; + + @Autowired + private ResumeFollowRecordService resumeFollowRecordService; + + @Autowired + private PostGradeService postGradeService; + + @Autowired + private EntryManageService entryManageService; + + + // @RequiresPermissions("@ss.hasPermi('recruit:follow:add')") +// @Log(title = "新增招聘计划与统计", businessType = BusinessType.INSERT) +// @PostMapping("/follow/add") +// @ApiOperation(value = "新增招聘计划与统计") +// public AjaxResult add(@Validated @RequestBody PostPlanFollow req) { +// //根据postId找到postName +// RecruitPost recruitPost = recruitPostService.getById(req.getPostId()); +// //根据deptId找到deptName +// //SysDept sysDept = iSysDeptService.selectDeptById(req.getDeptId()); +// RecruitStructure recruitStructure = recruitStructureService.selectNodeById(req.getDeptId()); +// req.setPostName(recruitPost.getPostName()); +// req.setDeptName(recruitStructure.getNodeName()); +// req.setHrId(getUserId()); +// req.setCreateDate(LocalDate.now()); +// //根据userId找到用户名 +// SysUser sysUser = iSysUserService.selectUserById(getUserId()); +// req.setHrName(sysUser.getNickName()); +// req.setId(String.valueOf(IdWorker.getId())); +// return toAjax(postPlanFollowService.save(req)); +// } +// +// +// @RequiresPermissions("@ss.hasPermi('recruit:follow:list')") +// @GetMapping("/follow/list") +// @ApiOperation(value = "查询招聘计划与统计列表") +// public List list(PostPlanFollow req) { +// startPage(); +// List postPlanFollowList=postPlanFollowService.listBySelect(req); +// List tableDataInfoList=new ArrayList<>(); +// //拿到筛选完条件的list后(应该是具体的某个月的list),再根据week进行分组 +// Map> groupByWeek = postPlanFollowList.stream().collect(Collectors.groupingBy(PostPlanFollow::getWeek)); +// for (Map.Entry> entry : groupByWeek.entrySet()) { +// List postPlanFollows = entry.getValue(); +// postPlanFollows.forEach( +// postPlanFollow -> { +// //到面率=实际到人数/约面人数; +// if(postPlanFollow.getInviteInterviewCount() != 0) { +// BigDecimal actualCountBigDecimal = new BigDecimal(postPlanFollow.getActualCount()); +// BigDecimal inviteInterviewCountBigDecimal = new BigDecimal(postPlanFollow.getInviteInterviewCount()); +// +// // 计算到达率,保留两位小数 +// BigDecimal arriveRateBigDecimal = actualCountBigDecimal.divide(inviteInterviewCountBigDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); +// +// double arriveRate = arriveRateBigDecimal.doubleValue(); +// postPlanFollow.setArriveRate(arriveRate); +// }else { +// postPlanFollow.setArriveRate(0d); +// } +// //招聘达成率=入职人数/需求人数 +// if(postPlanFollow.getPostCount() != 0) { +// BigDecimal entryCountBigDecimal = new BigDecimal(postPlanFollow.getEntryCount()); +// BigDecimal postCountBigDecimal = new BigDecimal(postPlanFollow.getPostCount()); +// +// // 计算达成率,保留两位小数 +// BigDecimal achievementRateBigDecimal = entryCountBigDecimal.divide(postCountBigDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); +// +// double achievementRate = achievementRateBigDecimal.doubleValue(); +// postPlanFollow.setAchievementRate(achievementRate); +// }else { +// postPlanFollow.setAchievementRate(0d); +// } +// } +// ); +// tableDataInfoList.add(getDataTable(postPlanFollows)); +// } +// return tableDataInfoList; +// } +// +// @RequiresPermissions("@ss.hasAnyPermi('recruit:follow:edit')") +// @GetMapping("/follow/{id}") +// @ApiOperation(value = "获取某条招聘计划与统计") +// public AjaxResult get(@PathVariable ("id")String id){ +// return success(postPlanFollowService.getById(id)); +// } +// +// @RequiresPermissions("@ss.hasAnyPermi('recruit:follow:edit')") +// @PutMapping("/follow/edit") +// @ApiOperation(value = "修改某条招聘计划与统计") +// public AjaxResult edit(@Validated@RequestBody PostPlanFollow postPlanFollow){ +// return toAjax(postPlanFollowService.updateById(postPlanFollow)); +// } +// +// @RequiresPermissions("@ss.hasAnyPermi('recruit:follow:delete')") +// @DeleteMapping("follow/delete/{id}") +// @ApiOperation(value = "删除某条招聘计划与统计") +// public AjaxResult delete (@PathVariable("id") String id){ +// return toAjax(postPlanFollowService.removeById(id)); +// } + @RequiresPermissions("recruit:follow:list") + @GetMapping("/follow/list") + @ApiOperation(value = "查询招聘计划与统计列表") + public AjaxResult list(FollowDTO req) { + List followVOList = new ArrayList<>(); + String month = req.getMonth(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 解析字符串为YearMonth对象 + YearMonth yearMonth = YearMonth.parse(month, formatter); + // 获取月份的第一天 + LocalDate startDate = yearMonth.atDay(1); + // 获取月份的最后一天 + LocalDate endDate =LocalDate.now(); + req.setStartDate(startDate); + req.setEndDate(endDate); + // 获取符合条件的简历处理记录并按岗位ID分组 + Map> mapResumeHandleRecord = resumeHandleRecordService.listBySelect(req) + .stream().collect(Collectors.groupingBy(ResumeHandleRecord::getPostId)); + + if (!mapResumeHandleRecord.isEmpty()) { + mapResumeHandleRecord.forEach((postId, listByPostId) -> { + if (!listByPostId.isEmpty()) { + ResumeHandleRecord firstRecord = listByPostId.get(0); + FollowVO followVO = new FollowVO(); + followVO.setPostId(firstRecord.getPostId()); + followVO.setPostName(firstRecord.getPostName()); + followVO.setDeptId(firstRecord.getDeptId()); + followVO.setDeptName(firstRecord.getDeptName()); + followVO.setHrId(firstRecord.getOperatorId()); + followVO.setHrName(firstRecord.getOperatorName()); + + RecruitStructure postNodeId = recruitStructureService.getByNodeId(followVO.getPostId()); + followVO.setPostCount(postNodeId != null && postNodeId.getTaskId() != null + ? recruitProcessTaskService.getByTaskId(postNodeId.getTaskId()).getPostCount() + : 0); + + followVO.setLookResumeCount(listByPostId.stream().mapToInt(ResumeHandleRecord::getGreetNum).sum()); + followVO.setInviteInterviewCount(listByPostId.stream().mapToInt(ResumeHandleRecord::getReceiveInviteNum).sum()); + + followVOList.add(followVO); + } + }); + } + + // 获取符合条件的面试跟踪记录并按岗位ID分组 + handleFollowRecords(req, followVOList,startDate,endDate); + + //获取该月份,筛选岗位等级的岗位信息 + List postGradeList=postGradeService.listByMonth(req.getMonth(),req.getGrade(),req.getHrName(),req.getPostName()); + // 获取所有的 postId 列表 + List postGradeIds = postGradeList.stream() + .map(PostGrade::getPostId) + .collect(Collectors.toList()); + // 获取 followVOList 中的所有 postId 列表 + Set followVOIds = followVOList.stream() + .map(FollowVO::getPostId) + .collect(Collectors.toSet()); + + // 找出 postGradeIds 中不包含在 followVOIds 的所有 postId + List missingPostIds = postGradeIds.stream() + .filter(postId -> !followVOIds.contains(postId)) + .collect(Collectors.toList()); + + // 过滤 followVOList 中的 postId 不在 postGradeIds 里的数据 + List filteredFollowVOList = followVOList.stream() + .filter(followVO -> postGradeIds.contains(followVO.getPostId())) + .collect(Collectors.toList()); + + missingPostIds.forEach( + missingPostId->{ + Optional optionalPostGrade = postGradeList.stream() + .filter(postGrade -> postGrade.getPostId() == missingPostId) + .findFirst(); + PostGrade postGrade = optionalPostGrade.get(); + FollowVO followVO = new FollowVO(); + followVO.setPostName(postGrade.getPostName()); + followVO.setPostId(postGrade.getPostId()); + followVO.setHrName(postGrade.getHrName()); + followVO.setDeptName(postGrade.getDeptName()); + RecruitStructure byNodeId = recruitStructureService.getByNodeId(missingPostId); + if(byNodeId.getTaskId()!=null){ + RecruitProcessTask byTaskId = recruitProcessTaskService.getByTaskId(byNodeId.getTaskId()); + followVO.setPostCount(byTaskId.getPostCount()); + } + filteredFollowVOList.add(followVO); + } + ); + //获取入职管理的(接受offer人数:是否确认入职)(入职人数:实际入职日期) + List entryManageList=entryManageService.getOfferCounts(startDate,endDate); + if(!CollectionUtils.isEmpty(entryManageList)){ + //筛选出entryManageList里《接受offer人数》 + List offerLists = entryManageList.stream() + .filter(entry -> "1".equals(entry.getIsEntry())) + .collect(Collectors.toList()); + //将这个offerList 根据岗位id进行分组 + Map> offerMap = offerLists.stream().collect(Collectors.groupingBy(EntryManage::getPostId)); + + //筛选出entryManageList里《入职人数》 + List entryList = entryManageList.stream() + .filter(entry -> entry.getActualJoinDate() != null) + .collect(Collectors.toList()); + Map> entryMap = entryList.stream().collect(Collectors.groupingBy(EntryManage::getPostId)); + filteredFollowVOList.forEach(followVO -> { + List offer = offerMap.get(followVO.getPostId()); + List entry = entryMap.get(followVO.getPostId()); + + if (offer != null) { + followVO.setOfferCount(offer.size()); + } + if(entry!=null){ + followVO.setEntryCount(entry.size()); + } + }); + } + + // filteredFollowVOList,将所有字段(除了deptName)为null的字段设置为0 + filteredFollowVOList.forEach(followVO -> { + if (followVO.getPostId() == null) followVO.setPostId(0L); + if (followVO.getPostName() == null) followVO.setPostName(""); + if (followVO.getDeptId() == null) followVO.setDeptId(0L); + if (followVO.getDeptName() == null) followVO.setDeptName(handleDeptName(followVO.getPostId())); + if (followVO.getHrId() == null) followVO.setHrId(0L); + if (followVO.getHrName() == null) followVO.setHrName(""); + //如果需求的岗位是空,则是突发生成的岗位,没有绑定jd的,所以默认为1 + if (followVO.getPostCount() == null||followVO.getPostCount()==0) followVO.setPostCount(1); + if (followVO.getLookResumeCount() == null) followVO.setLookResumeCount(0); + if (followVO.getInviteInterviewCount() == null) followVO.setInviteInterviewCount(0); + if (followVO.getPassResumeCount() == null) followVO.setPassResumeCount(0); + if (followVO.getFirstInterviewCount() == null) followVO.setFirstInterviewCount(0L); + if (followVO.getSecondInterviewCount() == null) followVO.setSecondInterviewCount(0L); + if (followVO.getThirdInterviewCount() == null) followVO.setThirdInterviewCount(0L); + if (followVO.getSalaryCount() == null) followVO.setSalaryCount(0L); + if (followVO.getOfferCount() == null) followVO.setOfferCount(0); + if (followVO.getEntryCount() == null) followVO.setEntryCount(0); + + //再根据岗位公海里绑定的hr进行重新覆盖写入;因为有可能某岗位被分配给其他人了。 + RecruitPost recruitPost = recruitPostService.getOne(new LambdaQueryWrapper().eq(RecruitPost::getNodeId, followVO.getPostId())); + if(!ObjectUtils.isEmpty(recruitPost)){ + followVO.setHrId(recruitPost.getHrId()); + followVO.setHrName(recruitPost.getHrName()); + } + + Optional optionalPostGrade = postGradeList.stream() + .filter(postGrade -> Objects.equals(postGrade.getPostId(), followVO.getPostId())) + .findFirst(); + if(optionalPostGrade.isPresent()){ + followVO.setGrade(optionalPostGrade.get().getGrade()); + } + + //封装到面率(一面人数/接受邀约人数) + if(followVO.getInviteInterviewCount()!=null&&followVO.getInviteInterviewCount()!=0){ + BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getInviteInterviewCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + followVO.setArriveRate(arrivePercentage.doubleValue()); + }else { + followVO.setArriveRate(0d); + } + //封装招聘达成率(入职人数/需求人数) + if(followVO.getPostCount()!=null&&followVO.getPostCount()!=0){ + BigDecimal entryPercentage = new BigDecimal(followVO.getEntryCount()).divide(new BigDecimal(followVO.getPostCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + followVO.setAchievementRate(entryPercentage.doubleValue()); + }else { + followVO.setAchievementRate(0d); + } + + }); + + filteredFollowVOList.sort(Comparator.comparing(followVO -> Integer.parseInt(followVO.getGrade()))); + + return AjaxResult.success(filteredFollowVOList); + } + + private String handleDeptName(Long postId) { + return recruitStructureService.findTopLevelDepartmentNameByNodeId(postId); + } + + private void handleFollowRecords(FollowDTO req, List followVOList,LocalDate startDate,LocalDate endDate) { + String hrName = req.getHrName(); + // 定义所有需要处理的状态及其对应的Map + Map>> statusMaps = new HashMap<>(); + statusMaps.put(-1, resumeFollowRecordService.listBySelect(req).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + statusMaps.put(0, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 0).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + statusMaps.put(4, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 4).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + statusMaps.put(5, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 5).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + statusMaps.put(1, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 1).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + // statusMaps.put(2, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 2).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + //statusMaps.put(6, resumeFollowRecordService.getBySelectMonth(hrName, startDate, endDate, 6).stream().collect(Collectors.groupingBy(ResumeFollowRecord::getPostId))); + + // 处理每种状态下的记录 + for (Map.Entry>> entry : statusMaps.entrySet()) { + int status = entry.getKey(); + Map> mapResumeFollowRecord = entry.getValue(); + + if (!mapResumeFollowRecord.isEmpty()) { + for (Map.Entry> recordEntry : mapResumeFollowRecord.entrySet()) { + Long postId = recordEntry.getKey(); + List records = recordEntry.getValue(); + + FollowVO followVO = followVOList.stream().filter(f -> f.getPostId().equals(postId)).findFirst().orElseGet(() -> { + FollowVO newFollowVO = new FollowVO(); + ResumeFollowRecord firstRecord = records.get(0); + newFollowVO.setPostId(firstRecord.getPostId()); + newFollowVO.setPostName(firstRecord.getPostName()); + newFollowVO.setHrId(firstRecord.getHrId()); + newFollowVO.setHrName(firstRecord.getHrName()); + RecruitStructure postNodeId = recruitStructureService.getByNodeId(newFollowVO.getPostId()); + newFollowVO.setPostCount(postNodeId != null && postNodeId.getTaskId() != null + ? recruitProcessTaskService.getByTaskId(postNodeId.getTaskId()).getPostCount() + : 0); + followVOList.add(newFollowVO); + return newFollowVO; + }); + + switch (status) { + case -1: + followVO.setPassResumeCount(records.size()); + break; + case 0: + followVO.setFirstInterviewCount(records.stream().filter(r -> "1".equals(r.getFirstReach())).count()); + break; + case 4: + followVO.setSecondInterviewCount(records.stream().filter(r -> "1".equals(r.getSecondReach())).count()); + break; + case 5: + followVO.setThirdInterviewCount(records.stream().filter(r -> "1".equals(r.getFinalReach())).count()); + break; + case 1: + followVO.setSalaryCount(records.stream().filter(r -> "1".equals(r.getFinalPass())).count()); + break; +// case 6: +// followVO.setOfferCount(records.stream().filter(r -> "1".equals(r.getAcceptOffer())).count()); +// break; +// case 2: +// followVO.setEntryCount(records.stream().filter(r -> r.getActualJoinDate() != null).count()); +// break; + } + } + } + } + } + + + + + + @PostMapping("/export") + @RequiresPermissions("'recruit:follow:export") + @ApiOperation(value = "下载招聘计划与统计列表") + @Log(title = "下载招聘计划与统计列表", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response, FollowDTO req) { + + List followVOList = new ArrayList<>(); + String month = req.getMonth(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 解析字符串为YearMonth对象 + YearMonth yearMonth = YearMonth.parse(month, formatter); + // 获取月份的第一天 + LocalDate startDate = yearMonth.atDay(1); + // 获取月份的最后一天 + LocalDate endDate =LocalDate.now(); + req.setStartDate(startDate); + req.setEndDate(endDate); + // 获取符合条件的简历处理记录并按岗位ID分组 + Map> mapResumeHandleRecord = resumeHandleRecordService.listBySelect(req) + .stream().collect(Collectors.groupingBy(ResumeHandleRecord::getPostId)); + + if (!mapResumeHandleRecord.isEmpty()) { + mapResumeHandleRecord.forEach((postId, listByPostId) -> { + if (!listByPostId.isEmpty()) { + ResumeHandleRecord firstRecord = listByPostId.get(0); + FollowVO followVO = new FollowVO(); + followVO.setPostId(firstRecord.getPostId()); + followVO.setPostName(firstRecord.getPostName()); + followVO.setDeptId(firstRecord.getDeptId()); + followVO.setDeptName(firstRecord.getDeptName()); + followVO.setHrId(firstRecord.getOperatorId()); + followVO.setHrName(firstRecord.getOperatorName()); + + RecruitStructure postNodeId = recruitStructureService.getByNodeId(followVO.getPostId()); + followVO.setPostCount(postNodeId != null && postNodeId.getTaskId() != null + ? recruitProcessTaskService.getByTaskId(postNodeId.getTaskId()).getPostCount() + : 0); + + followVO.setLookResumeCount(listByPostId.stream().mapToInt(ResumeHandleRecord::getGreetNum).sum()); + followVO.setInviteInterviewCount(listByPostId.stream().mapToInt(ResumeHandleRecord::getReceiveInviteNum).sum()); + + followVOList.add(followVO); + } + }); + } + + // 获取符合条件的面试跟踪记录并按岗位ID分组 + handleFollowRecords(req, followVOList,startDate,endDate); + + //获取该月份,筛选岗位等级的岗位信息 + List postGradeList=postGradeService.listByMonth(req.getMonth(),req.getGrade(),req.getHrName(),req.getPostName()); + // 获取所有的 postId 列表 + List postGradeIds = postGradeList.stream() + .map(PostGrade::getPostId) + .collect(Collectors.toList()); + // 获取 followVOList 中的所有 postId 列表 + Set followVOIds = followVOList.stream() + .map(FollowVO::getPostId) + .collect(Collectors.toSet()); + + // 找出 postGradeIds 中不包含在 followVOIds 的所有 postId + List missingPostIds = postGradeIds.stream() + .filter(postId -> !followVOIds.contains(postId)) + .collect(Collectors.toList()); + + // 过滤 followVOList 中的 postId 不在 postGradeIds 里的数据 + List filteredFollowVOList = followVOList.stream() + .filter(followVO -> postGradeIds.contains(followVO.getPostId())) + .collect(Collectors.toList()); + + missingPostIds.forEach( + missingPostId->{ + Optional optionalPostGrade = postGradeList.stream() + .filter(postGrade -> postGrade.getPostId() == missingPostId) + .findFirst(); + PostGrade postGrade = optionalPostGrade.get(); + FollowVO followVO = new FollowVO(); + followVO.setPostName(postGrade.getPostName()); + followVO.setPostId(postGrade.getPostId()); + followVO.setHrName(postGrade.getHrName()); + followVO.setDeptName(postGrade.getDeptName()); + RecruitStructure byNodeId = recruitStructureService.getByNodeId(missingPostId); + if(byNodeId.getTaskId()!=null){ + RecruitProcessTask byTaskId = recruitProcessTaskService.getByTaskId(byNodeId.getTaskId()); + followVO.setPostCount(byTaskId.getPostCount()); + } + filteredFollowVOList.add(followVO); + } + ); + //获取入职管理的(接受offer人数:是否确认入职)(入职人数:实际入职日期) + List entryManageList=entryManageService.getOfferCounts(startDate,endDate); + if(!CollectionUtils.isEmpty(entryManageList)){ + //筛选出entryManageList里《接受offer人数》 + List offerLists = entryManageList.stream() + .filter(entry -> "1".equals(entry.getIsEntry())) + .collect(Collectors.toList()); + //将这个offerList 根据岗位id进行分组 + Map> offerMap = offerLists.stream().collect(Collectors.groupingBy(EntryManage::getPostId)); + + //筛选出entryManageList里《入职人数》 + List entryList = entryManageList.stream() + .filter(entry -> entry.getActualJoinDate() != null) + .collect(Collectors.toList()); + Map> entryMap = entryList.stream().collect(Collectors.groupingBy(EntryManage::getPostId)); + filteredFollowVOList.forEach(followVO -> { + List offer = offerMap.get(followVO.getPostId()); + List entry = entryMap.get(followVO.getPostId()); + + if (offer != null) { + followVO.setOfferCount(offer.size()); + } + if(entry!=null){ + followVO.setEntryCount(entry.size()); + } + }); + } + + //需求人数总数 + Integer postCountTotal=0; + //主动打招呼总数 + Integer lookResumeCountTotal=0; + //合格简历总数 + Integer passResumeCountTotal=0; + //约面人数总数 + Integer inviteInterviewCountTotal=0; + //初试总数 + Long firstInterviewCountTotal=0L; + //终试总数 + Long thirdInterviewCountTotal=0L; + //终试通过人数总数 + Long salaryCountTotal=0L; + //接收offer人数总数 + Integer offerCountTotal=0; + //入职人数总数 + Integer entryCountTotal=0; + + // filteredFollowVOList,将所有字段(除了deptName)为null的字段设置为0 + for (FollowVO followVO:filteredFollowVOList){ + if (followVO.getPostId() == null) followVO.setPostId(0L); + if (followVO.getPostName() == null) followVO.setPostName(""); + if (followVO.getDeptId() == null) followVO.setDeptId(0L); + if (followVO.getDeptName() == null) followVO.setDeptName(handleDeptName(followVO.getPostId())); + if (followVO.getHrId() == null) followVO.setHrId(0L); + if (followVO.getHrName() == null) followVO.setHrName(""); + if (followVO.getPostCount() == null) followVO.setPostCount(0); + if (followVO.getLookResumeCount() == null) followVO.setLookResumeCount(0); + if (followVO.getInviteInterviewCount() == null) followVO.setInviteInterviewCount(0); + if (followVO.getPassResumeCount() == null) followVO.setPassResumeCount(0); + if (followVO.getFirstInterviewCount() == null) followVO.setFirstInterviewCount(0L); + if (followVO.getSecondInterviewCount() == null) followVO.setSecondInterviewCount(0L); + if (followVO.getThirdInterviewCount() == null) followVO.setThirdInterviewCount(0L); + if (followVO.getSalaryCount() == null) followVO.setSalaryCount(0L); + if (followVO.getOfferCount() == null) followVO.setOfferCount(0); + if (followVO.getEntryCount() == null) followVO.setEntryCount(0); + + Optional optionalPostGrade = postGradeList.stream() + .filter(postGrade -> Objects.equals(postGrade.getPostId(), followVO.getPostId())) + .findFirst(); + if(optionalPostGrade.isPresent()){ + followVO.setGrade(optionalPostGrade.get().getGrade()); + } + + //封装到面率(一面人数/接受邀约人数) + if(followVO.getInviteInterviewCount()!=null&&followVO.getInviteInterviewCount()!=0){ + BigDecimal arrivePercentage = new BigDecimal(followVO.getFirstInterviewCount()).divide(new BigDecimal(followVO.getInviteInterviewCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + followVO.setArriveRate(arrivePercentage.doubleValue()); + }else { + followVO.setArriveRate(0d); + } + //封装招聘达成率(入职人数/需求人数) + if(followVO.getPostCount()!=null&&followVO.getPostCount()!=0){ + BigDecimal entryPercentage = new BigDecimal(followVO.getEntryCount()).divide(new BigDecimal(followVO.getPostCount()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + followVO.setAchievementRate(entryPercentage.doubleValue()); + }else { + followVO.setAchievementRate(0d); + } + postCountTotal+=followVO.getPostCount(); + lookResumeCountTotal+=followVO.getLookResumeCount(); + passResumeCountTotal+=followVO.getPassResumeCount(); + inviteInterviewCountTotal+=followVO.getInviteInterviewCount(); + firstInterviewCountTotal+=followVO.getFirstInterviewCount(); + thirdInterviewCountTotal+=followVO.getThirdInterviewCount(); + salaryCountTotal+=followVO.getSalaryCount(); + offerCountTotal+= followVO.getOfferCount(); + entryCountTotal+=followVO.getEntryCount(); + + } + + + filteredFollowVOList.sort(Comparator.comparing(followVO -> Integer.parseInt(followVO.getGrade()))); + //在这里添加一个合计 + FollowVO followVOTotal = new FollowVO(); + followVOTotal.setDeptName("总计"); + followVOTotal.setPostCount(postCountTotal); + followVOTotal.setLookResumeCount(lookResumeCountTotal); + followVOTotal.setPassResumeCount(passResumeCountTotal); + followVOTotal.setInviteInterviewCount(inviteInterviewCountTotal); + followVOTotal.setFirstInterviewCount(firstInterviewCountTotal); + followVOTotal.setThirdInterviewCount(thirdInterviewCountTotal); + followVOTotal.setSalaryCount(salaryCountTotal); + followVOTotal.setOfferCount(offerCountTotal); + followVOTotal.setEntryCount(entryCountTotal); + filteredFollowVOList.add(followVOTotal); + + ExcelUtil util = new ExcelUtil(FollowVO.class); + util.exportExcel(response,filteredFollowVOList, "任务跟踪"); + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitInterviewController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitInterviewController.java new file mode 100644 index 0000000..4de605a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitInterviewController.java @@ -0,0 +1,350 @@ +package com.zeroerr.recruit.controller; + + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.file.MimeTypeUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.file.config.RuoYiConfig; +import com.zeroerr.file.utils.FileUploadUtils; +import com.zeroerr.recruit.domain.dto.ToppingDTO; +import com.zeroerr.recruit.domain.entity.InterviewTag; +import com.zeroerr.recruit.domain.entity.ResumeFollowRecord; +import com.zeroerr.recruit.domain.vo.InterViewTagVO; +import com.zeroerr.recruit.domain.vo.UserVO; +import com.zeroerr.recruit.service.InterviewTagService; +import com.zeroerr.recruit.service.RecruitPostService; +import com.zeroerr.recruit.service.ResumeFollowRecordService; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.api.domain.SysDictData; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.service.ISysDictDataService; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; +import com.zeroerr.system.service.RecruitStructureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.*; + +import static com.zeroerr.common.security.utils.SecurityUtils.getLoginUser; + +@RestController +@RequestMapping("/recruit/process") +@Api(tags = "招聘管理-面试管理") +public class RecruitInterviewController extends BaseController { + @Autowired(required = false) + private ISysUserService iSysUserService; + + @Autowired + private ResumeFollowRecordService resumeFollowRecordService; + + @Autowired + private RecruitPostService recruitPostService; + + @Autowired + private ISysRoleService iSysRoleService; + + @Autowired + private RecruitStructureService recruitStructureService; + + @Autowired + private ISysDictDataService iSysDictDataService; + + @Autowired + private InterviewTagService interviewTagService; + + + @RequiresPermissions("recruit:interview:list") + @GetMapping("/interview/getAllUser") + @ApiOperation(value = "查询所有的用户(领导+hr)") + public AjaxResult getHr() { + List userListVO = new ArrayList<>(); + List userList = iSysUserService.selectAllUserList(); + if (!CollectionUtils.isEmpty(userList)) { + userList.forEach( + sysUser -> { + UserVO user = new UserVO(); + user.setUserId(sysUser.getUserId()); + user.setName(sysUser.getNickName()); + userListVO.add(user); + } + ); + } + return success(userListVO); + } + + @RequiresPermissions("recruit:interview:list") + @GetMapping("/interview/list") + @ApiOperation(value = "获取《面试管理》简历跟进记录列表") + public TableDataInfo getResumeRecordList(ResumeFollowRecord req) { + //获取操作人的角色,如果是hr或者hr其他角色,则只显示自己的信息 + //根据用户id获取所有的该审批人的角色ids + boolean isHr = false; + List sysRoles = iSysRoleService.rolesByUserId(SecurityUtils.getUserId()); + if (!CollectionUtils.isEmpty(sysRoles)) { + for (SysRole sysRole : sysRoles) { + //如果角色是hr + if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { + isHr = true; + } + } + } + if (isHr) { + req.setHrId(SecurityUtils.getUserId()); + } + startPage(); + //找出所有置顶后的排序数据 + List resumeFollowRecordList = resumeFollowRecordService.listByQuery(req); + if(!CollectionUtils.isEmpty(resumeFollowRecordList)){ + //将每个tags,拿出来,分类 + resumeFollowRecordList.forEach( + record -> { + if(record.getTags() != null && !record.getTags().trim().isEmpty()){ + String tags = record.getTags(); + String[] tagGroups = tags.split(";"); + Map> groupedTags = new HashMap<>(); + // 将每个tags,拿出来,分类 + for (String tag : tagGroups) { + String[] tagArray = tag.split(","); + String key = tagArray[0]; // 第一个数字作为分组的键 + List tagsList = Arrays.asList(tagArray); + groupedTags.computeIfAbsent(key, k -> new ArrayList<>()).add(tag); + } + List pending=new ArrayList<>(); + List pass=new ArrayList<>(); + List fail=new ArrayList<>(); + + for (Map.Entry> entry : groupedTags.entrySet()) { + // 根据key进行分类 (1:待定 2:通过 3:未通过) + if(entry.getKey().equals("1")){ + //将每个string的以逗号分割,取出最后的元素 + for (String value : entry.getValue()) { + String[] elements = value.split(","); + String lastElement = elements[elements.length - 1]; + //根据这个元素,找到对应的名字 + InterviewTag tag = interviewTagService.getById(lastElement); + pending.add(tag.getTagName()); + } + }else if(entry.getKey().equals("2")){ + //将每个string的以逗号分割,取出最后的元素 + for (String value : entry.getValue()) { + String[] elements = value.split(","); + String lastElement = elements[elements.length - 1]; + //根据这个元素,找到对应的名字 + InterviewTag tag = interviewTagService.getById(lastElement); + pass.add(tag.getTagName()); + } + }else if(entry.getKey().equals("3")){ + //将每个string的以逗号分割,取出最后的元素 + for (String value : entry.getValue()) { + String[] elements = value.split(","); + String lastElement = elements[elements.length - 1]; + //根据这个元素,找到对应的名字 + InterviewTag tag = interviewTagService.getById(lastElement); + fail.add(tag.getTagName()); + } + } + } + record.setPending(pending); + record.setPass(pass); + record.setFail(fail); + } + } + ); + } + return getDataTable(resumeFollowRecordList); + } + + @RequiresPermissions("recruit:interview:add") + @PostMapping("/interview/add") + @ApiOperation(value = "增加《面试管理》简历跟进记录") + public AjaxResult addInterviewRecord(@Validated @RequestBody ResumeFollowRecord req) { + req.setHrId(SecurityUtils.getUserId()); + SysUser sysUser = iSysUserService.selectUserById(SecurityUtils.getUserId()); + req.setHrName(sysUser.getNickName()); + RecruitStructure recruitStructure = recruitStructureService.getByNodeId(req.getPostId()); + req.setPostName(recruitStructure.getNodeName()); + req.setCreateDate(LocalDate.now()); + //默认不置顶 + req.setTopping(false); + return toAjax(resumeFollowRecordService.save(req)); + } + + @RequiresPermissions("recruit:interview:query") + @GetMapping("/interview/{id}") + @ApiOperation(value = "获取《面试管理》简历跟进记录列表") + public AjaxResult getResumeRecordList(@PathVariable("id") Long id) { + return success(resumeFollowRecordService.getById(id)); + } + + @RequiresPermissions("recruit:interview:delete") + @DeleteMapping("/interview/{id}") + @ApiOperation(value = "获取《面试管理》简历跟进记录列表") + public AjaxResult deleteResumeRecordList(@PathVariable("id") Long id) { + return toAjax(resumeFollowRecordService.removeById(id)); + } + + @RequiresPermissions("recruit:interview:edit") + @PutMapping("/interview/edit") + @ApiOperation(value = "修改《面试管理》简历跟进记录") + public AjaxResult edit(@Validated @RequestBody ResumeFollowRecord req) { + return toAjax(resumeFollowRecordService.updateById(req)); + } + + @Log(title = "上传简历", businessType = BusinessType.UPDATE) + @RequiresPermissions("recruit:interview:add") + @PostMapping("/interview/uploadResume") + @ApiOperation(value = "《面试管理》上传简历") + public AjaxResult structureImages(@RequestParam("file") MultipartFile file) throws Exception { + if (!file.isEmpty()) { + LoginUser loginUser = getLoginUser(); + String resumeUrl = FileUploadUtils.upload(RuoYiConfig.getImportPath(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + AjaxResult ajax = AjaxResult.success(); + ajax.put("resumeUrl", resumeUrl); + return ajax; + } + return error("上传文件异常,请联系管理员"); + } + + @RequiresPermissions("recruit:interview:topping") + @PutMapping("/interview/editTopping") + @ApiOperation(value = "修改《面试管理》简历跟进记录是否置顶") + public AjaxResult editTopping(@RequestBody ToppingDTO req) { + LocalDateTime localDateTime = LocalDateTime.now(); + if (req.getTopping()) { + return AjaxResult.success(resumeFollowRecordService.update(new LambdaUpdateWrapper() + .set(ResumeFollowRecord::getTopping, req.getTopping()) + .set(ResumeFollowRecord::getToppingTime, localDateTime) + .eq(ResumeFollowRecord::getId, req.getId()))); + } + return AjaxResult.success(resumeFollowRecordService.update(new LambdaUpdateWrapper() + .set(ResumeFollowRecord::getTopping, req.getTopping()) + .set(ResumeFollowRecord::getToppingTime, null) + .eq(ResumeFollowRecord::getId, req.getId()))); + } + + @PostMapping("/interview/export") + @RequiresPermissions("recruit:interview:export") + @ApiOperation(value = "下载《面试管理》简历跟进记录") + @Log(title = "下载《面试管理》简历跟进记录", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response,ResumeFollowRecord req) { + boolean isHr = false; + List sysRoles = iSysRoleService.rolesByUserId(SecurityUtils.getUserId()); + if (!CollectionUtils.isEmpty(sysRoles)) { + for (SysRole sysRole : sysRoles) { + //如果角色是hr + if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { + isHr = true; + } + } + } + if (isHr) { + req.setHrId(SecurityUtils.getUserId()); + } + List resumeFollowRecordList = resumeFollowRecordService.listByQuery(req); + if (!CollectionUtils.isEmpty(resumeFollowRecordList)) { + resumeFollowRecordList.forEach( + record -> { + // 处理招聘渠道 + String recruitmentChannel = record.getRecruitmentChannel(); + if (StringUtils.hasText(recruitmentChannel)) { + String[] channelArray = recruitmentChannel.split(","); + StringBuilder newChannel = new StringBuilder(); + for (String channel : channelArray) { + // 去字典里找 recruit_process_channel, 如果前台编辑了,记得修改 + SysDictData channelDict = iSysDictDataService.selectByChannel(channel, "recruit_process_channel"); + if (channelDict != null && StringUtils.hasText(channelDict.getDictLabel())) { + if (newChannel.length() > 0) { + newChannel.append(","); + } + newChannel.append(channelDict.getDictLabel()); + } + } + record.setRecruitmentChannel(newChannel.toString()); + } + //处理初试人 + record.setFirstInterviewerIds(handleInterviewee(record.getFirstInterviewerIds())); + //处理复试人 + record.setSecondInterviewerIds(handleInterviewee(record.getSecondInterviewerIds())); + //处理终试人 + record.setFinalInterviewerIds(handleInterviewee(record.getFinalInterviewerIds())); + //处理简历 + record.setFile("https://oa.hr.zeroerr.cn/prod-api"+record.getFile()); + } + ); + } + ExcelUtil util = new ExcelUtil(ResumeFollowRecord.class); + util.exportExcel(response,resumeFollowRecordList, "面试管理数据"); + } + + private String handleInterviewee(String interviewerIds) { + if (!StringUtils.hasText(interviewerIds)) { + return ""; + } + + StringBuilder nameList = new StringBuilder(); + String[] intervieweeArray = interviewerIds.split(","); + for (String interviewee : intervieweeArray) { + if (StringUtils.hasText(interviewee)) { + SysUser user = iSysUserService.selectUserById(Long.valueOf(interviewee)); + if (user != null && StringUtils.hasText(user.getNickName())) { + if (nameList.length() > 0) { + nameList.append(","); + } + nameList.append(user.getNickName()); + } + } + } + return nameList.toString(); + } + + + @RequiresPermissions("recruit:interview:list") + @GetMapping("/interview/tag") + @ApiOperation(value = "返回面试标签的树状列表") + public AjaxResult InterviewTag() { + List allTags = interviewTagService.list(); + List interViewTagVOList = buildTree(allTags, null); + return AjaxResult.success(interViewTagVOList); + } + + private List buildTree(List allTags, Long parentId) { + List result = new ArrayList<>(); + for (InterviewTag tag : allTags) { + if ((parentId == null && tag.getParentId() == null) || (parentId != null && parentId.equals(tag.getParentId()))) { + InterViewTagVO vo = new InterViewTagVO(); + vo.setValue(tag.getTagId()); + vo.setLabel(tag.getTagName()); + + List children = buildTree(allTags, tag.getTagId()); + if (!children.isEmpty()) { + vo.setChildren(children); + } + result.add(vo); + } + } + return result; + } + + +} + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitPostGradeController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitPostGradeController.java new file mode 100644 index 0000000..b3b24bb --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitPostGradeController.java @@ -0,0 +1,115 @@ +package com.zeroerr.recruit.controller; + + +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.recruit.domain.entity.PostGrade; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.service.PostGradeService; +import com.zeroerr.recruit.service.RecruitProcessTaskService; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.service.ISysUserService; +import com.zeroerr.system.service.RecruitStructureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDate; +import java.util.List; + +@RestController +@RequestMapping("/recruit/postGrade") +@Api(tags = "招聘管理-岗位评级") +public class RecruitPostGradeController extends BaseController { + + @Autowired + private PostGradeService postGradeService; + + @Autowired + private RecruitProcessTaskService recruitProcessTaskService; + + @Autowired + private RecruitStructureService recruitStructureService; + + @Autowired + private ISysUserService iSysUserService; + + + @RequiresPermissions("recruit:grade:add") + @PostMapping("/add") + @ApiOperation(value = "增加某月份的岗位评级") + public AjaxResult addPostGrade(@Validated @RequestBody PostGrade req) { + //封装该hr的信息 + req.setHrId(SecurityUtils.getUserId()); + req.setHrName(iSysUserService.selectUserById(SecurityUtils.getUserId()).getNickName()); +// //封装部门信息 +// RecruitStructure deptByNodeId = recruitStructureService.getDeptByNodeId(req.getPostId()); +// req.setDeptId(deptByNodeId.getNodeId()); +// req.setDeptName(deptByNodeId.getNodeName()); + //封装创建日期 + req.setCreateDate(LocalDate.now()); + + //找到对应的单据id + RecruitStructure post = recruitStructureService.getByNodeId(req.getPostId()); + if(post.getTaskId()!=null){ + RecruitProcessTask byTaskId = recruitProcessTaskService.getByTaskId(post.getTaskId()); + if(!ObjectUtils.isEmpty(byTaskId)){ + req.setApplyDate(byTaskId.getApplyDate()); + req.setPostCount(byTaskId.getPostCount()); + } + } + return toAjax(postGradeService.save(req)); + } + + @RequiresPermissions("@ss.hasAnyPermi('recruit:grade:edit')") + @PutMapping("/edit") + @ApiOperation(value = "修改某月份的岗位评级") + public AjaxResult editPostGrade(@Validated @RequestBody PostGrade req) { + return toAjax(postGradeService.updateById(req)); + } + + @RequiresPermissions("@ss.hasAnyPermi('recruit:grade:query')") + @GetMapping("/list") + @ApiOperation(value = "展示某月份的岗位评级") + public TableDataInfo listPostGrade(PostGrade req) { + startPage(); + List postGradeList=postGradeService.listBySelect(req); + return getDataTable(postGradeList); + } + + @RequiresPermissions("@ss.hasAnyPermi('recruit:grade:delete')") + @DeleteMapping("/delete/{gradeId}") + @ApiOperation(value = "删除某月份的岗位评级") + public AjaxResult deletePostGrade(@PathVariable("gradeId")Long gradeId) { + return toAjax(postGradeService.removeById(gradeId)); + } + + @RequiresPermissions("@ss.hasAnyPermi('recruit:grade:edit')") + @GetMapping("/get/{gradeId}") + @ApiOperation(value = "获取某一个某月份的岗位评级") + public AjaxResult getOnePostGrade(@PathVariable("gradeId")Long gradeId) { + return AjaxResult.success(postGradeService.getById(gradeId)); + } + + @PostMapping("/export") + @RequiresPermissions("@ss.hasAnyPermi('recruit:grade:export')") + @ApiOperation(value = "下载岗位评级") + @Log(title = "下载岗位评级", businessType = BusinessType.EXPORT) + public void export(HttpServletResponse response, PostGrade req){ + List postGradeList=postGradeService.listBySelect(req); + ExcelUtil util = new ExcelUtil(PostGrade.class); + util.exportExcel(response,postGradeList, "岗位评级"); + } + + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitProcessController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitProcessController.java new file mode 100644 index 0000000..bc32bf9 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitProcessController.java @@ -0,0 +1,627 @@ +package com.zeroerr.recruit.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.zeroerr.common.core.enums.ProcessAction; +import com.zeroerr.common.core.enums.ProcessResult; +import com.zeroerr.common.core.enums.ProcessTaskNodeStatus; +import com.zeroerr.common.core.utils.file.MimeTypeUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.file.config.RuoYiConfig; +import com.zeroerr.file.utils.FileUploadUtils; +import com.zeroerr.recruit.domain.dto.PostStatusDTO; +import com.zeroerr.recruit.domain.dto.RecordListDTO; +import com.zeroerr.recruit.domain.entity.RecruitPost; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.domain.entity.RecruitProcessTaskNode; +import com.zeroerr.recruit.domain.entity.ResumeHandleRecord; +import com.zeroerr.recruit.domain.vo.*; +import com.zeroerr.recruit.service.RecruitPostService; +import com.zeroerr.recruit.service.RecruitProcessTaskNodeService; +import com.zeroerr.recruit.service.RecruitProcessTaskService; +import com.zeroerr.recruit.service.ResumeHandleRecordService; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.service.ISysDeptService; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; +import com.zeroerr.system.service.RecruitStructureService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/recruit/process") +@Api(tags = "招聘管理-在招岗位") +public class RecruitProcessController extends BaseController { + @Autowired + private RecruitProcessTaskService recruitProcessTaskService; + + @Autowired + private RecruitStructureService recruitStructureService; + + @Autowired + private RecruitProcessTaskNodeService recruitProcessTaskNodeService; + + @Autowired + private ISysRoleService iSysRoleService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private ISysDeptService iSysDeptService; + + @Autowired + private ResumeHandleRecordService resumeHandleRecordService; + + @Autowired + private RecruitPostService recruitPostService; + + + @RequiresPermissions("recruit:apply:add") + @Log(title = "新增审批单据", businessType = BusinessType.INSERT) + @PostMapping("/apply") + @ApiOperation(value = "审批-《我的申请》新增招聘申请单") + public AjaxResult add(@Validated @RequestBody RecruitProcessTask task) { + if(task.getStructurePostId()!=null){ + //先去验证该岗位的状态(未申请:0 ;申请中:1 ;已招聘:2;招聘中:3;取消招聘:4) + RecruitStructure recruitStructure = recruitStructureService.selectNodeById(task.getStructurePostId()); + if(!ObjectUtils.isEmpty(recruitStructure)){ + if(recruitStructure.getPostType()==1){ + return AjaxResult.error(task.getPostName()+"正在申请中"); + }else if(recruitStructure.getPostType()==2){ + return AjaxResult.error(task.getPostName()+"已招聘"); + }else if(recruitStructure.getPostType()==3){ + return AjaxResult.error(task.getPostName()+"正在招聘中"); + }else if(recruitStructure.getPostType()==4){ + return AjaxResult.error(task.getPostName()+"已取消招聘"); + } + } + } + + task.setTaskId(String.valueOf(IdWorker.getId())); + task.setUserId(SecurityUtils.getUserId()); + task.setUserDeptId(SecurityUtils.getLoginUser().getDeptId()); + task.setUserName(SecurityUtils.getUsername()); + task.setCreateBy(SecurityUtils.getUsername()); + return toAjax(recruitProcessTaskService.handleAddTask(task)); + } + + + @Log(title = "上传组织架构图片", businessType = BusinessType.UPDATE) + @RequiresPermissions("recruit:apply:add") + @PostMapping("/structure/images") + @ApiOperation(value = "审批-《我的申请》上传组织架构图片") + public AjaxResult structureImages(@RequestParam("file") MultipartFile file) throws Exception { + if (!file.isEmpty()) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + String avatar = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + AjaxResult ajax = AjaxResult.success(); + ajax.put("imgUrl", avatar); + return ajax; + } + return error("上传图片异常,请联系管理员"); + } + + + @GetMapping("/apply/listDept") + @ApiOperation(value = "审批-《我的申请》获取所有二级部门") + public AjaxResult dept() { + List recruitStructureList = recruitStructureService.listSecond(); + List structureVOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(recruitStructureList)) { + recruitStructureList.forEach( + recruitStructure -> { + StructureVO structureVO = new StructureVO(); + structureVO.setDeptId(recruitStructure.getNodeId()); + structureVO.setDeptName(recruitStructure.getNodeName()); + structureVOList.add(structureVO); + } + ); + } + return success(structureVOList); + } + + @RequiresPermissions("recruit:apply:add") + @GetMapping("/apply/listDept/{nodeId}") + @ApiOperation(value = "审批-《我的申请》,根据岗位node_id获取其所属的部门") + public AjaxResult deptByNodeId(@PathVariable("nodeId")Long nodeId){ + + return success(recruitStructureService.getDeptByNodeId(nodeId)); + } + + + @RequiresPermissions({"recruit:process:list","recruit:postsea:list","recruit:resume:list","recruit:follow:add"}) + @GetMapping("/apply/listStructurePost") + @ApiOperation(value = "审批-《我的申请》获取所有的组织架构里的岗位节点") + public AjaxResult listStructurePost() { + List recruitStructureList = recruitStructureService.listStructureList(); + List structurePostVOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(recruitStructureList)) { + recruitStructureList.forEach( + recruitStructure -> { + StructurePostVO structurePostVO = new StructurePostVO(); + structurePostVO.setStructurePostId(recruitStructure.getNodeId()); + structurePostVO.setPostName(recruitStructure.getNodeName()); + structurePostVOList.add(structurePostVO); + } + ); + } + return success(structurePostVOList); + } + + + @RequiresPermissions("@ss.hasPermi('recruit:process:list')") + @GetMapping("/apply/list") + @ApiOperation(value = "审批-《我的申请》分页/条件查询获取表单") + public TableDataInfo list(RecruitProcessTask task) { + startPage(); + task.setUserDeptId(SecurityUtils.getLoginUser().getDeptId()); + List taskList = recruitProcessTaskService.list(task,SecurityUtils.getUserId()); + + return getDataTable(taskList); + } + + + @RequiresPermissions({"recruit:apply:query","recruit:pending:query","recruit:approved:query","recruit:postsea:query"}) + @GetMapping(value = "/{taskId}") + @ApiOperation(value = "审批-根据taskId获取单据详情") + public AjaxResult getInfo(@PathVariable String taskId) { + return success(recruitProcessTaskService.getByTaskId(taskId)); + } + + + @RequiresPermissions("recruit:apply:cancel") + @PutMapping(value = "/apply/{taskId}") + @ApiOperation(value = "审批-《我的申请》撤销单据") + public AjaxResult cancel(@PathVariable String taskId) { + //将该taskId绑定的组织架构岗位状态变成未申请 + recruitStructureService.updateByTaskId(taskId); + return toAjax(recruitProcessTaskService.cancel(taskId)); + } + + + @RequiresPermissions("recruit:apply:reapply") + @Log(title = "重新修改数据再次提交招聘申请单", businessType = BusinessType.INSERT) + @PostMapping("/apply/reapply") + @ApiOperation(value = "审批-《我的申请》审批通过后-重新修改数据再次提交招聘申请单") + public AjaxResult reapply(@Validated @RequestBody RecruitProcessTask task) { + //将岗位 置为作废(该岗位招聘的状态 0:正在招聘中 1:已完成招聘 2:取消招聘 3:岗位作废) +// recruitPostService.update( +// new LambdaUpdateWrapper() +// .set(RecruitPost::getStatus,3) +// .eq(RecruitPost::getTaskId,task.getTaskId()) +// ); + //判断该岗位是否已经招聘,若已经招聘,则不可以重申 + RecruitStructure recruitStructure = recruitStructureService.selectNodeById(task.getStructurePostId()); + if(!ObjectUtils.isEmpty(recruitStructure)){ + if(recruitStructure.getPostType()==2){ + return AjaxResult.error(task.getPostName()+"已申请,不可重申"); + }else if(recruitStructure.getPostType()==4){ + return AjaxResult.error(task.getPostName()+"已取消招聘,不可重申"); + } + } + //将老的审批变成reapply重申 + recruitProcessTaskService.updateReapply(task.getTaskId()); + //删除岗位列表里的该岗位数据 + recruitPostService.remove(new LambdaQueryWrapper().eq(RecruitPost::getTaskId,task.getTaskId())); + + //新增审批(改变taskId) + task.setTaskId(String.valueOf(IdWorker.getId())); + task.setUserId(SecurityUtils.getUserId()); + task.setUserDeptId(SecurityUtils.getLoginUser().getDeptId()); + task.setUserName(SecurityUtils.getUsername()); + task.setCreateBy(SecurityUtils.getUsername()); + task.setCompleteTime(null); + task.setHrId(null); + task.setHrName(null); + return toAjax(recruitProcessTaskService.handleAddTask(task)); + } + + + @RequiresPermissions("recruit:process:list") + @GetMapping("/pending/list") + @ApiOperation(value = "审批-《待我审批》分页/条件查询获取表单") + public TableDataInfo listPending(RecruitProcessTask task) { + startPage(); + Long userId = SecurityUtils.getUserId(); + List taskList = recruitProcessTaskService.listPending(task, userId); + //把taskList的taskId变成字符串 + return getDataTable(taskList); + } + + + @RequiresPermissions({"recruit:pending:approved","recruit:pending:repulse","recruit:pending:refuse","recruit:pending:edit","recruit:mypost:query"}) + @PutMapping("/pending/audit") + @ApiOperation(value = "审批-《待我审批》审批某单据") + public AjaxResult audit(@Validated @RequestBody ApprovedResultVO req) { + //根据用户id获取所有的该审批人的角色ids + boolean isCEO = false; + List sysRoles = iSysRoleService.rolesByUserId(SecurityUtils.getUserId()); + if (!CollectionUtils.isEmpty(sysRoles)) { + for (SysRole sysRole : sysRoles) { + //如果角色的key=ceo ; !!!该地方ceo只能有一个!!! + if (sysRole.getRoleKey().equals("ceo")) { + isCEO = true; + } + } + } + //由CEO审批 + if (isCEO) { + //找到审批节点id + RecruitProcessTaskNode node = recruitProcessTaskNodeService.getNodeByTaskId(req.getTaskId()); + + //如果是审批同意 ||如果是审批拒绝 + if (!req.getResult().equals(ProcessResult.repulse.name())) { + //处理审批单据 + recruitProcessTaskService.handleApproved(req); + //处理审批节点 + recruitProcessTaskNodeService.handle(req, node.getNodeId()); + //如果是审批同意,则新增岗位节点 + if(req.getResult().equals(ProcessResult.approved.name())){ + RecruitProcessTask recruitProcessTask = recruitProcessTaskService.getByTaskId(req.getTaskId()); + //新增岗位,未绑定hr + RecruitPost recruitPost = new RecruitPost(); + recruitPost.setNodeId(recruitProcessTask.getStructurePostId()); + recruitPost.setTaskId(req.getTaskId()); + recruitPost.setPostName(recruitProcessTask.getPostName()); + recruitPost.setDeptId(recruitProcessTask.getDeptId()); + recruitPost.setDeptName(recruitProcessTask.getDeptName()); + recruitPost.setIsAllocation(0); + recruitPost.setCreateTime(LocalDate.now()); +// RecruitPost recruitPost = RecruitPost.builder() +// .taskId(req.getTaskId()) +// .nodeId(recruitProcessTask.getStructurePostId()) +// .postName(recruitProcessTask.getPostName()) +// .deptId(recruitProcessTask.getDeptId()) +// .deptName(recruitProcessTask.getDeptName()) +// //默认未分配 +// .isAllocation(0) +// .createTime(LocalDate.now()) +// .build(); + recruitPostService.save(recruitPost); + if(recruitProcessTask.getStructurePostId()!=null){ + //将该审批绑定的组织架构节点给更新成招聘中的状态 + recruitStructureService.updatePostType(recruitProcessTask.getStructurePostId(),3, recruitProcessTask.getTaskId()); + } + } + } + //如果是打回 + else { + //找到需要修改单据的hr人员信息。 + SysUser sysUser = iSysUserService.selectUserById(req.getUserId()); + //找到需要修改单据的hr部门信息。 + //SysDept sysDept = iSysDeptService.selectDeptById(sysUser.getDeptId()); + RecruitStructure recruitStructure = recruitStructureService.selectNodeById(sysUser.getDeptId()); + + //处理审批单据 + recruitProcessTaskService.handleRepulse(req); + //处理审批节点(result变成《打回》 ; status变成《完成》 填入remark。) + recruitProcessTaskNodeService.handle(req, node.getNodeId()); + //新增审批节点(打回给具体某个hr进行修改) + RecruitProcessTaskNode newNode = + RecruitProcessTaskNode.builder() + .nodeId(String.valueOf(IdWorker.getId())) + .orderNum(node.getOrderNum() + 1) + .taskId(req.getTaskId()) + .deptName(recruitStructure.getNodeName()) + .deptId(sysUser.getDeptId()) + .action(ProcessAction.audit.name()) + .status(ProcessTaskNodeStatus.process.name()) + .operatorId(req.getUserId()) + .operatorName(sysUser.getNickName()) + .build(); + recruitProcessTaskNodeService.save(newNode); + } + } + //如果是HR审批 + else { + //找到审批节点id + RecruitProcessTaskNode node = recruitProcessTaskNodeService.getNodeByTaskId(req.getTaskId()); + //更新审批节点,把remark填进去,把审批时间调整为现在,把审批状态调整成完成。 + recruitProcessTaskNodeService.handleEdit(req.getRemark(), node.getNodeId(), LocalDateTime.now(), ProcessTaskNodeStatus.complete.name()); + //找到总经理角色的用户id + SysUser sysUser = iSysUserService.selectCEORole(); + //找到总经理所在的部门 + //SysDept sysDept = iSysDeptService.selectDeptById(sysUser.getDeptId()); + RecruitStructure recruitStructure = recruitStructureService.selectNodeById(sysUser.getDeptId()); + //更新审批状态:正在修改-》已修改 + recruitProcessTaskService.handleEdit(req.getTaskId()); + //获取ceo的信息 + SysUser ceo = iSysUserService.selectCEORole(); + //新增审批节点 + RecruitProcessTaskNode newNode = + RecruitProcessTaskNode.builder() + .nodeId(String.valueOf(IdWorker.getId())) + .taskId(req.getTaskId()) + .operatorId(ceo.getUserId()) + .orderNum(node.getOrderNum() + 1) + .deptName(recruitStructure.getNodeName()) + .deptId(sysUser.getDeptId()) + .action(ProcessAction.edit.name()) + .status(ProcessTaskNodeStatus.process.name()) + .operatorName(sysUser.getNickName()) + .build(); + recruitProcessTaskNodeService.save(newNode); + } + return success(); + } + + + @RequiresPermissions("recruit:pending:edit") + @PutMapping("/pending/edit/") + @ApiOperation(value = "审批-《待我审批》hr修改某单据") + public AjaxResult edit(@Validated @RequestBody RecruitProcessTask task) { + return success(recruitProcessTaskService.updateById(task)); + } + + + @RequiresPermissions("recruit:process:list") + @GetMapping("/approved/list") + @ApiOperation(value = "审批-《我已审批》分页/条件查询获取表单") + public TableDataInfo listApproved(RecruitProcessTask task) { + startPage(); + Long userId = SecurityUtils.getUserId(); + List taskList = recruitProcessTaskService.listApproved(task, userId); + //把taskList的taskId变成字符串 + return getDataTable(taskList); + } + + + @RequiresPermissions("recruit:jd:list") + @GetMapping("/jd/list") + @ApiOperation(value = "审批-《我已审批》分页/条件查询获取表单") + public TableDataInfo jdList(RecruitProcessTask task) { + startPage(); + List taskList = recruitProcessTaskService.listAllPass(task); + //把taskList的taskId变成字符串 + return getDataTable(taskList); + } + + + @GetMapping("/pending/getHr") + @ApiOperation(value = "审批-《待我审批》查询所有的hr") + public AjaxResult getHr() { + List hrList = new ArrayList<>(); + List sysUserList = iSysUserService.selectHrList(); + if (!CollectionUtils.isEmpty(sysUserList)) { + sysUserList.forEach( + sysUser -> { + UserVO hrVO = new UserVO(); + hrVO.setUserId(sysUser.getUserId()); + hrVO.setName(sysUser.getNickName()); + hrList.add(hrVO); + } + ); + } + return success(hrList); + } + + + @RequiresPermissions("recruit:postsea:list") + @GetMapping("/postsea/list") + @ApiOperation(value = "岗位公海-分页/条件查询获取表单") + public TableDataInfo postseaList(RecruitPost req) { + startPage(); + List recruitPostList= recruitPostService.listPostSea(req); + List nodeIds = recruitPostList.stream().map(RecruitPost::getNodeId).collect(Collectors.toList()); + List recruitStructureList=recruitStructureService.getNodeList(nodeIds); + Map> recruitStructureMap = recruitStructureList.stream().collect(Collectors.groupingBy(RecruitStructure::getNodeId)); + recruitPostList.forEach( + recruitPost -> { + if(recruitStructureMap.get(recruitPost.getNodeId()).size()>0){ + recruitPost.setPostType(recruitStructureMap.get(recruitPost.getNodeId()).get(0).getPostType()); + } + } + ); + //把taskList的taskId变成字符串 + return getDataTable(recruitPostList); + } + + + @RequiresPermissions("recruit:postsea:distribution") + @PutMapping("/postsea/distribution") + @ApiOperation(value = "岗位公海-hr主管分配岗位给具体hr") + public AjaxResult distribution(@Validated @RequestBody ApprovedResultVO req) { + if(req.getUserId()!=null){ + //查询该hr的信息 + SysUser sysUser = iSysUserService.selectUserById(req.getUserId()); + //更新岗位绑定该hr负责 + if(req.getTaskId()!=null){ + recruitProcessTaskService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getTaskId()); + } + recruitPostService.updateBindHR(sysUser.getUserId(), sysUser.getNickName(), req.getPostId()); + }else { + if(req.getTaskId()!=null){ + recruitProcessTaskService.updateUnBindHR(req.getTaskId()); + } + recruitPostService.updateUnBindHR(req.getPostId()); + } + + return success("成功分配"); + } + + @RequiresPermissions("recruit:postsea:distribution") + @GetMapping("/mypost/getOne/{postId}") + @ApiOperation(value = "岗位公海-获取某个岗位的hr分配数据") + public AjaxResult getPostList(@PathVariable("postId")Long postId) { + return AjaxResult.success(recruitPostService.getOne(new LambdaQueryWrapper().eq(RecruitPost::getPostId, postId))); + } + + @RequiresPermissions("recruit:mypost:list") + @GetMapping("/mypost/list") + @ApiOperation(value = "在招岗位-《我的招聘》分页/条件查询获取表单") + public TableDataInfo mypostList(RecruitProcessTask req) { + startPage(); + //借用一下task的userId字段 + req.setUserId(SecurityUtils.getUserId()); + List taskList = recruitProcessTaskService.listMyPost(req); + if (!CollectionUtils.isEmpty(taskList)) { + List taskIds = taskList.stream().map(RecruitProcessTask::getTaskId).collect(Collectors.toList()); + List recruitPostList = recruitPostService.list( + new LambdaQueryWrapper() + .in(RecruitPost::getTaskId, taskIds) + ); + taskList.forEach( + task -> { + recruitPostList.forEach( + recruitPost -> { + //根据recruitPost的nodeId找到具体的招聘状态 + RecruitStructure recruitStructure=recruitStructureService.getByNodeId(recruitPost.getNodeId()); + if (task.getTaskId().equals(recruitPost.getTaskId())) { + task.setRecruitStatus(recruitStructure.getPostType()); + } + } + ); + } + ); + } + //把taskList的taskId变成字符串 + return getDataTable(taskList); + } + + @RequiresPermissions({"recruit:mypost:list","recruit:postsea:list","recruit:process:list"}) + @GetMapping("/mypost/getRecord/{taskId}") + @ApiOperation(value = "在招岗位-《我的招聘》根据taskId获取单据详情") + public AjaxResult getEditRecord(@PathVariable("taskId") String taskId) { + List editRecortVOList = new ArrayList<>(); + List recruitProcessTaskNodeList = recruitProcessTaskNodeService.selectEditRecordList(taskId); + if (!CollectionUtils.isEmpty(recruitProcessTaskNodeList)) { + recruitProcessTaskNodeList.forEach( + recruitProcessTaskNode -> { + EditRecortVO editRecortVO = new EditRecortVO(); + editRecortVO.setName(recruitProcessTaskNode.getOperatorName()); + editRecortVO.setDate(recruitProcessTaskNode.getAuditTime().toLocalDate()); + editRecortVO.setRemark(recruitProcessTaskNode.getRemark()); + editRecortVOList.add(editRecortVO); + } + ); + } + return success(editRecortVOList); + } + + + @RequiresPermissions("recruit:resume:add") + @Log(title = "新增简历处理记录", businessType = BusinessType.INSERT) + @PostMapping("/mypost/resume/add") + @ApiOperation(value = "在招岗位-《简历处理》新增简历处理记录") + public AjaxResult addResumeRecord(@Validated @RequestBody ResumeHandleRecord record) { + record.setId(String.valueOf(IdWorker.getId())); + record.setOperatorId(SecurityUtils.getUserId()); + //根据用户id,获取用户姓名 + SysUser user = iSysUserService.selectUserById(SecurityUtils.getUserId()); + record.setOperatorName(user.getNickName()); + //根据岗位id获取岗位name +// RecruitPost recruitPost = recruitPostService.getById(record.getPostId()); +// record.setPostName(recruitPost.getPostName()); + RecruitStructure post = recruitStructureService.getByNodeId(record.getPostId()); + record.setPostName(post.getNodeName()); + //根据deptId,找到部门名 + RecruitStructure recruitStructure = recruitStructureService.selectNodeById(record.getDeptId()); + record.setDeptName(recruitStructure.getNodeName()); + + return toAjax(resumeHandleRecordService.save(record)); + } + + + + @GetMapping("/mypost/resume/postList") + @ApiOperation(value = "在招岗位-《简历处理》获取所有的岗位名字") + public AjaxResult getPostList() { + List postListVOList = new ArrayList<>(); + //List recruitPostList = recruitPostService.listMyPost(getUserId()); + List recruitPostList = recruitPostService.list(); + if (!CollectionUtils.isEmpty(recruitPostList)) { + recruitPostList.forEach( + recruitPost -> { + PostListVO postListVO = new PostListVO(); + //这里传入的是组织架构节点id + postListVO.setPostId(recruitPost.getNodeId()); + postListVO.setPostName(recruitPost.getPostName()); + postListVOList.add(postListVO); + } + ); + } + return success(postListVOList); + } + + @RequiresPermissions("recruit:resume:list") + @GetMapping("/mypost/resume/getRecordList") + @ApiOperation(value = "在招岗位-《简历处理》获取该员工所有的简历处理记录") + public TableDataInfo resumeRecordList(RecordListDTO req) { + boolean isHr = false; + List sysRoles = iSysRoleService.rolesByUserId(SecurityUtils.getUserId()); + if (!CollectionUtils.isEmpty(sysRoles)) { + for (SysRole sysRole : sysRoles) { + //如果角色是hr + if (sysRole.getRoleKey().equals("hr") || sysRole.getRoleKey().equals("hrleader")) { + isHr = true; + } + } + } + if (isHr) { + req.setHrId(SecurityUtils.getUserId()); + } + startPage(); + List resumeHandleRecordList = resumeHandleRecordService.listByCondition(req); + return getDataTable(resumeHandleRecordList); + } + + @RequiresPermissions("recruit:resume:query") + @GetMapping("/mypost/resume/getRecord/{id}") + @ApiOperation(value = "在招岗位-《简历处理》获取该员工某个的简历处理记录") + public AjaxResult resumeRecordList(@PathVariable("id") String id) { + return success(resumeHandleRecordService.getById(id)); + } + + + @RequiresPermissions("recruit:resume:edit") + @PutMapping("/mypost/resume/edit") + @ApiOperation(value = "在招岗位-《简历处理》hr修改某简历处理记录") + public AjaxResult editResumeRecord(@Validated @RequestBody ResumeHandleRecord req) { + return success(resumeHandleRecordService.updateById(req)); + } + + + @RequiresPermissions("recruit:resume:delete") + @DeleteMapping("/mypost/resume/delete/{id}") + @ApiOperation(value = "在招岗位-《简历处理》获取该员工所有的简历处理记录") + public AjaxResult deleteRecord(@PathVariable("id") String id) { + return toAjax(resumeHandleRecordService.removeById(id)); + } + + + @RequiresPermissions("recruit:mypost:edit") + @PutMapping("/mypost/edit") + @ApiOperation(value = "在招岗位-《简历处理》hr修改某岗位的招聘状态") + public AjaxResult editPostStatus(@Validated @RequestBody PostStatusDTO dto){ + return toAjax(recruitStructureService.update( + new LambdaUpdateWrapper() + .eq(RecruitStructure::getTaskId,dto.getTaskId()) + .set(RecruitStructure::getPostType,dto.getStatus()) + )) ; + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitStructureController.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitStructureController.java new file mode 100644 index 0000000..07a3823 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/controller/RecruitStructureController.java @@ -0,0 +1,158 @@ +package com.zeroerr.recruit.controller; + +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.recruit.service.RecruitPostService; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.service.RecruitStructureService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/recruit/structure") +public class RecruitStructureController extends BaseController { + @Autowired + private RecruitStructureService recruitStructureService; + + @Autowired + private RecruitPostService recruitPostService; + + + /** + * 新增节点 + */ + @RequiresPermissions("recruit:structure:add") + @Log(title = "新增组织架构", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody RecruitStructure node) + { + + if (!recruitStructureService.checkNodeNameUnique(node)) + { + return error("新增节点'" + node.getNodeName() + "'失败,节点名称已存在"); + } + node.setCreateBy(SecurityUtils.getUsername()); + recruitStructureService.insertNode(node); + node.setNodeId(node.getNodeId()); + RecruitStructure deptByNodeId = recruitStructureService.getDeptByNodeId(node.getNodeId()); + //如果是已招聘状态,则自动新增岗位在公海里等待被分配给具体的hr。 + if(node.getPostType().equals(2)){ + recruitPostService.newRecruitPost(node,deptByNodeId.getNodeId(),deptByNodeId.getNodeName()); + } + return AjaxResult.success(); + } + + + /** + * 获取节点列表 + */ + @RequiresPermissions("recruit:structure:list") + @GetMapping("/list") + public AjaxResult list(RecruitStructure node) + { + List nodes = recruitStructureService.selectNodeList(node); +// if(!CollectionUtils.isEmpty(nodes)){ +// nodes.forEach( +// one->{ +// //组织节点的类型(部门:0;岗位:1;其他:2) +// if(one.getType()!=null&&one.getType()==1){ +// //只有type=1,也就是为岗位的时候,这里有数据。(未申请:0 ;申请中:1 ;已招聘:2;招聘中:3;取消招聘:4) +// if(one.getPostType()==0){ +// one.setNodeName(one.getNodeName()+"|未申请"); +// }else if(one.getPostType()==1){ +// one.setNodeName(one.getNodeName()+"|申请中"); +// }else if(one.getPostType()==3){ +// one.setNodeName(one.getNodeName()+"|招聘中"); +// } +// } +// } +// ); +// } + return success(nodes); + } + + + + /** + * 修改节点 + */ + @RequiresPermissions("@ss.hasPermi('recruit:structure:edit')") + @Log(title = "节点管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody RecruitStructure node) + { + Long nodeId = node.getNodeId(); + recruitStructureService.checkNodeDataScope(nodeId); + if (!recruitStructureService.checkNodeNameUnique(node)) + { + return error("修改节点'" + node.getNodeName() + "'失败,节点名称已存在"); + } + else if (node.getParentId().equals(nodeId)) + { + return error("修改节点'" + node.getNodeName() + "'失败,上级节点不能是自己"); + } + else if (StringUtils.equals(UserConstants.DEPT_DISABLE, node.getStatus()) && recruitStructureService.selectNormalChildrenNodeById(nodeId) > 0) + { + return error("该节点包含未停用的子节点!"); + } + node.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(recruitStructureService.updateNode(node)); + } + + + /** + * 删除部门 + */ + @RequiresPermissions("@ss.hasPermi('recruit:structure:remove')") + @Log(title = "节点管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{nodeId}") + public AjaxResult remove(@PathVariable Long nodeId) + { + if (recruitStructureService.hasChildByNodeId(nodeId)) + { + return warn("存在下级节点,不允许删除"); + } +// if (recruitStructureService.checkNodeExistUser(nodeId)) +// { +// return warn("节点存在用户,不允许删除"); +// } + recruitStructureService.checkNodeDataScope(nodeId); + return toAjax(recruitStructureService.deleteNodeById(nodeId)); + } + + + /** + * 根据部门编号获取详细信息 + */ + @RequiresPermissions("@ss.hasPermi('recruit:structure:query')") + @GetMapping(value = "/{nodeId}") + public AjaxResult getInfo(@PathVariable Long nodeId) + { + recruitStructureService.checkNodeDataScope(nodeId); + return success(recruitStructureService.selectNodeById(nodeId)); + } + + + /** + * 查询部门列表(排除节点) + */ + @RequiresPermissions("@ss.hasPermi('recruit:structure:list')") + @GetMapping("/list/exclude/{nodeId}") + public AjaxResult excludeChild(@PathVariable(value = "nodeId", required = false) Long nodeId) + { + List nodes = recruitStructureService.selectNodeList(new RecruitStructure()); + nodes.removeIf(d -> d.getNodeId().intValue() == nodeId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), nodeId + "")); + return success(nodes); + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/AnnouncementDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/AnnouncementDTO.java new file mode 100644 index 0000000..69f6085 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/AnnouncementDTO.java @@ -0,0 +1,84 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.util.List; + + +@Data +@ApiModel +public class AnnouncementDTO { + + @ApiModelProperty(value = "公告id") + private Integer id; + + @ApiModelProperty(value = "日期") + private LocalDate date; + + @ApiModelProperty(value = "面试明细") + private List announcementInterviewList; + + @ApiModelProperty(value = "入职明细") + private List announcementEntryList; + + @Data + @Accessors(chain = true) + @ApiModel + public static class AnnouncementInterview { + @ApiModelProperty(value = "面试-日期") + private String date; + + @ApiModelProperty(value = "面试-时间 HH:ss") + private String interviewTime; + + @ApiModelProperty(value = "面试-姓名") + private String interviewName; + + @ApiModelProperty(value = "面试-状态") + private String interviewType; + + @ApiModelProperty(value = "面试-岗位") + private String interviewPostName; + + @ApiModelProperty(value = "面试-招聘hr") + private String interviewHrName; + + @ApiModelProperty(value = "面试-初试") + private String interviewFirstResult; + + @ApiModelProperty(value = "面试-终试") + private String interviewFinalResult; + + @ApiModelProperty(value = "面试-总经理预计面试时间") + private String managerTime; + + @ApiModelProperty(value = "总经理参与否") + private String isAttend; + + } + + @Data + @Accessors(chain = true) + @ApiModel + public static class AnnouncementEntry { + @ApiModelProperty(value = "预计入职-日期") + private String date; + + @ApiModelProperty(value = "预计入职-姓名") + private String entryName; + + @ApiModelProperty(value = "预计入职-部门") + private String entryDept; + + @ApiModelProperty(value = "预计入职-岗位") + private String entryPostName; + + @ApiModelProperty(value = "面试-招聘hr") + private String entryHrName; + + } +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/EntryManagerDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/EntryManagerDTO.java new file mode 100644 index 0000000..396f83d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/EntryManagerDTO.java @@ -0,0 +1,50 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Data +@ApiModel +public class EntryManagerDTO { + @ApiModelProperty(value = "岗位名称") + private String postName; + + @ApiModelProperty(value = "部门id") + private Long deptId; + + @ApiModelProperty(value = "id") + private Long entryId; + + @ApiModelProperty(value = "hrId") + private Long hrId; + + @ApiModelProperty(value = "hr的名字") + private String hrName; + + @ApiModelProperty(value = "姓名") + private String userName; + + @ApiModelProperty(value = "是否确认入职") + private String isEntry; + + @ApiModelProperty(value = "预计入职日期-起始") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startJoinDate; + + @ApiModelProperty(value = "预计入职日期-截止") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endJoinDate; + + @ApiModelProperty(value = "实际入职日期-起始") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startActualJoinDate; + + @ApiModelProperty(value = "实际入职日期-截止") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endActualJoinDate; + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/FollowDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/FollowDTO.java new file mode 100644 index 0000000..b43c6db --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/FollowDTO.java @@ -0,0 +1,39 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Data +@ApiModel +@AllArgsConstructor +@NoArgsConstructor +public class FollowDTO { + @ApiModelProperty(value = "岗位名称") + private String postName; + + @ApiModelProperty(value = "hr名") + private String hrName; + + @ApiModelProperty(value = "开始日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @ApiModelProperty(value = "结束日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; + + @ApiModelProperty(value = "部门id") + private Long deptId; + + @ApiModelProperty(value = "招聘等级") + private Integer grade; + + @ApiModelProperty(value = "选择月份") + private String month; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/HomePageDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/HomePageDTO.java new file mode 100644 index 0000000..047ab16 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/HomePageDTO.java @@ -0,0 +1,22 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +@ApiModel +public class HomePageDTO { + @ApiModelProperty("查询年月") + @NotEmpty(message = "年月不能为空") + private String month; + + @ApiModelProperty("hrId") + private Long hrId; + + @ApiModelProperty("hrName") + private String hrName; + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostDetailDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostDetailDTO.java new file mode 100644 index 0000000..42a76b7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostDetailDTO.java @@ -0,0 +1,18 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel +public class PostDetailDTO { + private Long postId; + private String postName; + private Integer postLookResumeCounts; + private Integer postQualifiedResumeCounts; + private Integer postSelfCounts; + private Long postDownLoadCounts; + private Integer postInviteCounts; + private Long postArriveCounts; + private Double qualificationRate; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostStatusDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostStatusDTO.java new file mode 100644 index 0000000..80dd8be --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/PostStatusDTO.java @@ -0,0 +1,15 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class PostStatusDTO { + @ApiModelProperty(value = "岗位招聘状态") + private Integer status; + + @ApiModelProperty(value = "单据id") + private String taskId; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/RecordListDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/RecordListDTO.java new file mode 100644 index 0000000..4fe2c77 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/RecordListDTO.java @@ -0,0 +1,29 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +@Data +@ApiModel +public class RecordListDTO { + @ApiModelProperty(value = "岗位名称") + private String postName; + + @ApiModelProperty(value = "开始日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @ApiModelProperty(value = "结束日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; + + @ApiModelProperty(value = "部门id") + private Long deptId; + + @ApiModelProperty(value = "hrid") + private Long hrId; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/ToppingDTO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/ToppingDTO.java new file mode 100644 index 0000000..d72384b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/dto/ToppingDTO.java @@ -0,0 +1,15 @@ +package com.zeroerr.recruit.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class ToppingDTO { + @ApiModelProperty(value = "简历跟进记录id") + private Long id; + + @ApiModelProperty(value = "是否置顶") + private Boolean topping; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/EntryManage.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/EntryManage.java new file mode 100644 index 0000000..e680a38 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/EntryManage.java @@ -0,0 +1,162 @@ +package com.zeroerr.recruit.domain.entity; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.annotation.Excel; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * + * @TableName entry_manage + */ +@TableName(value ="entry_manage") +@Data +public class EntryManage implements Serializable { + /** + * + */ + @TableId(value = "entry_id",type = IdType.AUTO) + @Excel(name = "用户序号", prompt = "用户编号") + private Long entryId; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 部门名字 + */ + @TableField(value = "dept_name") + @Excel(name = "部门") + private String deptName; + + /** + * 岗位id + */ + @TableField(value = "post_id") + private Long postId; + + /** + * 岗位名字 + */ + @TableField(value = "post_name") + @Excel(name = "岗位") + private String postName; + +// /** +// * 入职者id +// */ +// @TableField(value = "user_id") +// private Long userId; + + /** + * 入职者name + */ + @TableField(value = "user_name") + @Excel(name = "姓名") + private String userName; + + /** + * hr的id + */ + @TableField(value = "hr_id") + private Long hrId; + + /** + * hr的name + */ + @TableField(value = "hr_name") + @Excel(name = "招聘HR") + private String hrName; + + /** + * 终试通过的日期 + */ + @TableField(value = "final_pass_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "终试通过的日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate finalPassDate; + + /** + * 预计入职日期 + */ + @TableField(value = "join_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "预计入职日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate joinDate; + + /** + * 实际入职日期 + */ + @TableField(value = "actual_join_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际入职日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate actualJoinDate; + + + /** + * 是否确定入职 + */ + @TableField(value = "is_entry") + @Excel(name = "是否确定入职",dictType = "recruit_interview_pass") + private String isEntry; + + /** + * 入职失败的原因 + */ + @TableField(value = "entry_fail_reason") + @Excel(name = "未入职原因") + private String entryFailReason; + + @TableField(value = "create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @TableField(value = "update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + @TableField(value = "file",updateStrategy = FieldStrategy.IGNORED) + @Excel(name = "入职周知", cellType = Excel.ColumnType.TEXT) + private String file; + + + @TableField(value = "dossier",updateStrategy = FieldStrategy.IGNORED) + @Excel(name = "档案", cellType = Excel.ColumnType.TEXT) + private String dossier; + + /** + * 岗位等级 + */ + @TableField(value = "rank") + @Excel(name = "岗位等级",dictType = "recruit_post_rank") + private String rank; + + @TableField(value = "regular_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "转正时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate regularDate; + + @TableField(value = "termination_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "离职时间", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate terminationDate; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/InterviewTag.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/InterviewTag.java new file mode 100644 index 0000000..42f7fe2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/InterviewTag.java @@ -0,0 +1,38 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * + * @TableName interview_tag + */ +@TableName(value ="interview_tag") +@Data +public class InterviewTag implements Serializable { + /** + * + */ + @TableId(value = "tag_id", type = IdType.AUTO) + private Long tagId; + + /** + * 父节点id + */ + @TableField(value = "parent_id") + private Long parentId; + + /** + * 标签名 + */ + @TableField(value = "tag_name") + private String tagName; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostGrade.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostGrade.java new file mode 100644 index 0000000..b4c779a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostGrade.java @@ -0,0 +1,125 @@ +package com.zeroerr.recruit.domain.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zeroerr.common.core.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * + * @TableName post_grade + */ +@TableName(value ="post_grade") +@Data +public class PostGrade implements Serializable { + /** + * + */ + @TableId(value = "grade_id", type = IdType.AUTO) + private Long gradeId; + + /** + * 岗位id + */ + @TableField(value = "post_id") + private Long postId; + + /** + * 岗位名 + */ + @TableField(value = "post_name") + @Excel(name = "岗位") + private String postName; + + /** + * 申请日期 + */ + @TableField(value = "apply_date") + @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate applyDate; + + /** + * 需求人数 + */ + @TableField(value = "post_count") + @Excel(name = "需求人数") + private Integer postCount; + + /** + * 0:A ;1:B;2:C + */ + @TableField(value = "grade") + @Excel(name = "等级",dictType = "recruit_post_grade") + private String grade; + + /** + * hr的id + */ + @TableField(value = "hr_id") + private Long hrId; + + /** + * hr的名字 + */ + @TableField(value = "hr_name") + @Excel(name = "负责人") + private String hrName; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 部门名 + */ + @TableField(value = "dept_name") + @Excel(name = "部门") + private String deptName; + + /** + * 岗位评级的月份 + */ + @TableField(value = "month") + private String month; + + /** + * 新增日期 + */ + @TableField(value = "create_date") + private LocalDate createDate; + + /** + * 更新日期 + */ + @TableField(value = "update_date") + private LocalDateTime updateDate; + + /** + * 招聘到位周期 + */ + @TableField(value = "cycle") + @Excel(name = "招聘周期") + private Integer cycle; + + /** + * 备注 + */ + @TableField(value = "remark") + @Excel(name = "备注") + private String remark; + + @TableField(exist = false) + private Integer postType; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostPlanFollow.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostPlanFollow.java new file mode 100644 index 0000000..827fd67 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/PostPlanFollow.java @@ -0,0 +1,221 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * + * @TableName post_plan_follow + */ +@TableName(value ="post_plan_follow") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class PostPlanFollow implements Serializable { + /** + * + */ + @TableId(value = "id") + private String id; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 部门名字 + */ + @TableField(value = "dept_name") + private String deptName; + + /** + * 岗位id + */ + @TableField(value = "post_id") + private Long postId; + + /** + * 岗位名字 + */ + @TableField(value = "post_name") + private String postName; + + /** + * 招聘时间 + */ + @TableField(value = "recruit_date") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate recruitDate; + + /** + * 计划年月 + */ + @TableField(value = "ym") + private String ym; + + /** + * 计划周 + */ + @TableField(value = "week") + private String week; + + /** + * 需求人数 + */ + @TableField(value = "post_count") + private Integer postCount; + + /** + * 招聘优先级 + */ + @TableField(value = "grade") + private Integer grade; + + /** + * 约面目标 + */ + @TableField(value = "interview_count") + private Integer interviewCount; + + /** + * 面试通过目标 + */ + @TableField(value = "pass_count_target") + private Integer passCountTarget; + + /** + * 人力资源通过简历 + */ + @TableField(value = "pass_resume_count") + private Integer passResumeCount; + + /** + * 约面人数 + */ + @TableField(value = "invite_interview_count") + private Integer inviteInterviewCount; + + /** + * 一面人数 + */ + @TableField(value = "first_interview") + private Integer firstInterview; + + /** + * 二面人数 + */ + @TableField(value = "second_interview") + private Integer secondInterview; + + /** + * 三面人数 + */ + @TableField(value = "third_interview") + private Integer thirdInterview; + + /** + * 谈薪人数 + */ + @TableField(value = "salary_count") + private Integer salaryCount; + + /** + * offer人数 + */ + @TableField(value = "offer_count") + private Integer offerCount; + + /** + * 入职人数 + */ + @TableField(value = "entry_count") + private Integer entryCount; + + /** + * 离职人数 + */ + @TableField(value = "leave_count") + private Integer leaveCount; + + /** + * 实际到面人数 + */ + @TableField(value = "actual_count") + private Integer actualCount; + + /** + * 周初人数 + */ + @TableField(value = "early_week_count") + private Integer earlyWeekCount; + + /** + * 周末人数 + */ + @TableField(value = "late_week_count") + private Integer lateWeekCount; + + /** + * 离职率 + */ + @TableField(value = "leave_percent") + private Integer leavePercent; + + + /** + * 负责人id + */ + @TableField(value = "hr_id") + private Long hrId; + + /** + * 负责人名字 + */ + @TableField(value = "hr_name") + private String hrName; + + /** + * 到面率 + */ + @TableField(exist = false) + private Double arriveRate; + + /** + * 招聘达成率 + */ + @TableField(exist = false) + private Double achievementRate; + + /** + * 创建记录时间 + */ + @TableField(value = "create_date") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createDate; + + /** + * 更新记录时间 + */ + @TableField(value = "update_date") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateDate; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitPost.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitPost.java new file mode 100644 index 0000000..a4533b3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitPost.java @@ -0,0 +1,91 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 审批通过要招娉的岗位表 + * @TableName recruit_post + */ +@TableName(value ="recruit_post") +@Data +public class RecruitPost implements Serializable { + /** + * + */ + @TableId(value = "post_id", type = IdType.AUTO) + private Long postId; + + /** + * 负责招聘该岗位的hrid + */ + @TableField(value = "hr_id") + private Long hrId; + + /** + * 负责招聘该岗位的hr名字 + */ + @TableField(value = "hr_name") + private String hrName; + + /** + * 岗位名称 + */ + @TableField(value = "post_name") + private String postName; + + /** + * 绑定的审批单据id + */ + @TableField(value = "task_id") + private String taskId; + + /** + * 组织架构岗位节点id + */ + @TableField(value = "node_id") + private Long nodeId; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 部门名字 + */ + @TableField(value = "dept_name") + private String deptName; + + /** + * 岗位分配时间(岗位开始招聘时间) + */ + @TableField(value = "create_time") + private LocalDate createTime; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + private LocalDateTime updateTime; + + /** + * 是否已被分配(0:未分配 ;1:已分配) + */ + @TableField(value = "is_allocation") + private Integer isAllocation; + + @TableField(exist = false) + private Integer postType; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTask.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTask.java new file mode 100644 index 0000000..86b0bc5 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTask.java @@ -0,0 +1,267 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 岗位申请单据表 + * @TableName recruit_process_task + */ +@TableName(value ="recruit_process_task") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RecruitProcessTask extends BaseEntity implements Serializable { + /** + * + */ + @TableId(value = "task_id") + private String taskId; + + /** + * 部门名字 + */ + @TableField(value = "dept_name") + private String deptName; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 申请日期 + */ + @TableField(value = "apply_date") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate applyDate; + + /** + * 节点岗位id + */ + @TableField(value = "structure_post_id") + private Long structurePostId; + + /** + * 岗位名称 + */ + @TableField(value = "post_name") + private String postName; + + /** + * 招聘原因 + */ + @TableField(value = "recruit_reason") + private String recruitReason; + + /** + * 招聘人数 + */ + @TableField(value = "post_count") + private Integer postCount; + + /** + * 期望薪资 + */ + @TableField(value = "salary") + private String salary; + + /** + * 年龄 + */ + @TableField(value = "age") + private String age; + + /** + * 到岗时间 + */ + @TableField(value = "arrive_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private LocalDateTime arriveTime; + + /** + * 性别要求(0:男生;1:女生) + */ + @TableField(value = "sex") + private Integer sex; + + /** + * 最低学历(1:专科;2:本科;3:研究生) + */ + @TableField(value = "education") + private Integer education; + + /** + * 排名要求 + */ + @TableField(value = "rank") + private String rank; + + /** + * 工作经验(1:无需;2:一年以上;3:2年以上;3:3-5年;4:5年以上;6:十年以上) + */ + @TableField(value = "experience") + private Integer experience; + + /** + * 初面面试官 + */ + @TableField(value = "first_interview") + private String firstInterview; + + /** + * 复面面试官 + */ + @TableField(value = "second_interview") + private String secondInterview; + + /** + * 终面面试官 + */ + @TableField(value = "final_interview") + private String finalInterview; + + /** + * 笔试题目 + */ + @TableField(value = "examination") + private String examination; + + /** + * 招聘渠道(1:猎头 2:boss直聘;3:猎聘 4:内部推荐;5:官网;6:公众号;7:内部竞聘;8:校招) + */ + @TableField(value = "recruitment_channel") + private String recruitmentChannel; + + /** + * 必填关键词 + */ + @TableField(value = "required_keywords") + private String requiredKeywords; + + /** + * 选填关键词 + */ + @TableField(value = "optional_keywords") + private String optionalKeywords; + + /** + * 必要要求(A类) + */ + @TableField(value = "exclusive_requirement") + private String exclusiveRequirement; + + /** + * 优先要求(B类 + */ + @TableField(value = "precedence_requirement") + private String precedenceRequirement; + + /** + * 岗位职责 + */ + @TableField(value = "position_statement") + private String positionStatement; + + /** + * 任职要求 + */ + @TableField(value = "post_equirements") + private String postEquirements; + + /** + * 检索经验 + */ + @TableField(value = "check_experience") + private String checkExperience; + + /** + * 应聘材料(1:个人简历;2:身份证明;3:学历证明;4:技术职称证明;5:其他) + */ + @TableField(value = "application_materials") + private String applicationMaterials; + + /** + * 单据状态(process:审批中;cancel:撤销;refuse:拒绝;approve:同意;repulse:打回) + */ + @TableField(value = "status") + private String status; + + /** + * 申请人用户id + */ + @TableField(value = "user_id") + private Long userId; + + /** + * 申请人姓名 + */ + @TableField(value = "user_name") + private String userName; + + /** + * 申请人部门id + */ + @TableField(value = "user_dept_id") + private Long userDeptId; + + /** + * 删除标志(0代表存在 2代表删除) + */ + @TableField(value = "del_flag") + private String delFlag; + + /** + * 组织架构图片 + */ + @TableField(value = "images") + private String images; + /** + * 1:未修改;2:已修改;3:正在修改; + */ + @TableField(value = "edit") + private Integer edit; + + /** + * 负责招聘这个岗位的hrid + */ + @TableField(value = "hr_id") + private Integer hrId; + + + /** + * 负责招聘这个岗位的hr名字 + */ + @TableField(value = "hr_name") + private String hrName; + + /** + * 审批完成时间 + */ + @TableField(value = "complete_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private LocalDateTime completeTime; + + + + @TableField(exist = false) + private Integer recruitStatus; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTaskNode.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTaskNode.java new file mode 100644 index 0000000..5ba2c5c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/RecruitProcessTaskNode.java @@ -0,0 +1,100 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 流程节点表 + * @TableName recruit_process_task_node + */ +@TableName(value ="recruit_process_task_node") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RecruitProcessTaskNode implements Serializable { + /** + * 流程节点id + */ + @TableId(value = "node_id") + private String nodeId; + + /** + * 单据id + */ + @TableField(value = "task_id") + private String taskId; + + /** + * 经办人id + */ + @TableField(value = "operator_id") + private Long operatorId; + + /** + * 经办人名字 + */ + @TableField(value = "operator_name") + private String operatorName; + + /** + * 流程动作:apply->申请;audit->审批;cc->抄送; + */ + @TableField(value = "action") + private String action; + + /** + * 审批结果:approved->同意;refused->驳回; + */ + @TableField(value = "result") + private String result; + + /** + * 状态:ready->准备;process->正在处理;complete->处理完成;cancel->取消; + */ + @TableField(value = "status") + private String status; + + /** + * 经办人的部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 经办人的部门名称 + */ + @TableField(value = "dept_name") + private String deptName; + + /** + * 审批备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 审批时间 + */ + @TableField(value = "audit_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime auditTime; + + /** + * 节点序号 + */ + @TableField(value = "order_num") + private Integer orderNum; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeFollowRecord.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeFollowRecord.java new file mode 100644 index 0000000..9fbf428 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeFollowRecord.java @@ -0,0 +1,370 @@ +package com.zeroerr.recruit.domain.entity; + + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zeroerr.common.core.annotation.Excel; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * + * @TableName resume_follow_record + */ +@TableName(value ="resume_follow_record") +@Data +public class ResumeFollowRecord implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @Excel(name = "用户序号", prompt = "用户编号") + private Long id; + + /** + * 收到简历日期 + */ + @TableField(value = "receive_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "收到简历日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate receiveDate; + + /** + * 招聘渠道 + */ + @TableField(value = "recruitment_channel") + @Excel(name = "用户序号", width = 30) + private String recruitmentChannel; + + /** + * 简历来源 + */ + @TableField(value = "resume_source") + @Excel(name = "简历来源", dictType = "recruit_interview_source") + private String resumeSource; + + /** + * 面试人姓名 + */ + @TableField(value = "name") + @Excel(name = "面试人姓名") + private String name; + + /** + * 电话 + */ + @TableField(value = "phone") + @Excel(name = "电话") + private String phone; + + /** + * 岗位id + */ + @TableField(value = "post_id") + private Long postId; + + /** + * 岗位名称 + */ + @TableField(value = "post_name") + @Excel(name = "岗位名称") + private String postName; + + /** + * 简历是否符合JD + */ + @TableField(value = "suit_jd") + private String suitJd; + + /** + * 负责招聘的hrid + */ + @TableField(value = "hr_id") + private Long hrId; + + /** + * 负责招聘的hr名字 + */ + @TableField(value = "hr_name") + @Excel(name = "负责招聘的hr名字") + private String hrName; + + /** + * 面试日期 + */ + @TableField(value = "interview_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "面试日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate interviewDate; + + /** + * 是否通过面试 recruit_interview_phoneresult + */ + @TableField(value = "is_pass") + @Excel(name = "是否通过面试", dictType = "recruit_interview_phoneresult") + private String isPass; + + /** + * 邀约日期 + */ + @TableField(value = "invitation_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "邀约日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate invitationDate; + + /** + * 候选人拒绝的原因 + */ + @TableField(value = "rejected_reason") + @Excel(name = "候选人拒绝的原因") + private String rejectedReason; + + /** + * 初试日期 + */ + @TableField(value = "first_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @Excel(name = "初试日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm") + private LocalDateTime firstDate; + + /** + * 初试是否到面 + */ + @TableField(value = "first_reach") + @Excel(name = "初试是否到面", dictType = "recruit_interview_pass") + private String firstReach; + + /** + * 初试是否通过笔试 + */ + @TableField(value = "first_test") + @Excel(name = "初试是否通过笔试", dictType = "recruit_interview_pass") + private String firstTest; + + /** + * 初试面试人id + */ + @TableField(value = "first_interviewer_ids") + @Excel(name = "初试面试人") + private String firstInterviewerIds; + /** + * 初试是否通过 + */ + @TableField(value = "first_pass") + @Excel(name = "初试是否通过", dictType = "recruit_interview_pass") + private String firstPass; + + /** + * 复试日期 + */ + @TableField(value = "second_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "复试日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate secondDate; + + /** + * 复试是否到面 + */ + @TableField(value = "second_reach") + @Excel(name = "复试是否到面", dictType = "recruit_interview_pass") + private String secondReach; + + /** + * 复试面试人id + */ + @TableField(value = "second_interviewer_ids") + @Excel(name = "复试面试人") + private String secondInterviewerIds; + + /** + * 复试是否通过 + */ + @TableField(value = "second_pass") + @Excel(name = "复试是否通过", dictType = "recruit_interview_pass") + private String secondPass; + + /** + * 终试日期 + */ + @TableField(value = "final_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @Excel(name = "终试日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm") + private LocalDateTime finalDate; + + /** + * 终试是否到面 + */ + @TableField(value = "final_reach") + @Excel(name = "终试是否到面", dictType = "recruit_interview_pass") + private String finalReach; + + /** + * 终试面试人id + */ + @TableField(value = "final_interviewer_ids") + @Excel(name = "终试面试人") + private String finalInterviewerIds; + + /** + * 终面是否通过 + */ + @TableField(value = "final_pass") + @Excel(name = "终面是否通过", dictType = "recruit_interview_pass") + private String finalPass; + + /** + * 是否接受offer + */ + @TableField(value = "accept_offer") + @Excel(name = "是否接受offer", dictType = "recruit_interview_pass") + private String acceptOffer; + + /** + * 预计入职日期 + */ + @TableField(value = "join_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "预计入职日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate joinDate; + + /** + * n的原因 + */ + @TableField(value = "fail_reason") + @Excel(name = "n的原因") + private String failReason; + + /** + * 特殊情况说明 + */ + @TableField(value = "special_reason") + @Excel(name = "特殊情况说明") + private String specialReason; + + /** + * 创建时间 + */ + @TableField(value = "create_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate createDate; + + /** + * 更新时间 + */ + @TableField(value = "update_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate updateDate; + + /** + * 实际入职日期 + */ + @TableField(value = "actual_join_date",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实际入职日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate actualJoinDate; + + /** + * 上传的简历 cellType = ColumnType.IMAGE + */ + @TableField(value = "file") + @Excel(name = "简历", cellType = Excel.ColumnType.TEXT) + private String file; + + /** + * 是否置顶 + */ + @TableField(value = "topping") + private Boolean topping; + + + /** + * 标签是否置顶 + */ + @TableField(value = "tags") + private String tags; + /** + * 置顶时间 + */ + @TableField(value = "topping_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime toppingTime; + + /** + * 待定 + */ + @TableField(exist = false) + private List pending; + + + /** + * 通过 + */ + @TableField(exist = false) + private List pass; + + /** + * 未通过 + */ + @TableField(exist = false) + private List fail; + + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startFirstDate; + + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endFirstDate; + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startFinalDate; + + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endFinalDate; + + /** + * 预计总经理参与时间 + */ + @TableField(value = "manager_time",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @Excel(name = "预计总经理参与时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm") + private LocalDateTime managerTime; + + + /** + * 总经理是否参与 + */ + @TableField(value = "is_attend") + @Excel(name = "总经理是否参与", dictType = "recruit_interview_pass") + private String isAttend; + + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeHandleRecord.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeHandleRecord.java new file mode 100644 index 0000000..bb51182 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/entity/ResumeHandleRecord.java @@ -0,0 +1,111 @@ +package com.zeroerr.recruit.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 简历处理记录 + * @TableName resume_handle_record + */ +@TableName(value ="resume_handle_record") +@Data +public class ResumeHandleRecord implements Serializable { + /** + * + */ + @TableField(value = "id") + private String id; + + /** + * 审批通过的岗位id + */ + @TableField(value = "post_id") + private Long postId; + + /** + * 审批通过的岗位 + */ + @TableField(value = "post_name") + private String postName; + + /** + * 处理该岗位的日期 + */ + @TableField(value = "handle_date") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date handleDate; + + /** + * 招聘渠道 + */ + @TableField(value = "recruitment_channel") + private String recruitmentChannel; + + /** + * HR看过的牛人数 + */ + @TableField(value = "seen_num") + private Integer seenNum; + + /** + * HR打招呼的牛人数 + */ + @TableField(value = "greet_num") + private Integer greetNum; + + /** + * HR提交部门的简历数 + */ + @TableField(value = "submit_num") + private Integer submitNum; + + /** + * 通知面试的简历份数 + */ + @TableField(value = "qualified_num") + private Integer qualifiedNum; + + /** + * 接受邀约人数 + */ + @TableField(value = "receive_invite_num") + private Integer receiveInviteNum; + + /** + * 记录人id + */ + @TableField(value = "operator_id") + private Long operatorId; + + /** + * 记录人名字 + */ + @TableField(value = "operator_name") + private String operatorName; + + /** + * 部门id + */ + @TableField(value = "dept_id") + private Long deptId; + + /** + * 部门名字 + */ + @TableField(value = "dept_name") + private String deptName; + + /** + * 自投数量 + */ + @TableField(value = "self_counts") + private Integer selfCounts; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/AnnouncementVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/AnnouncementVO.java new file mode 100644 index 0000000..46923dc --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/AnnouncementVO.java @@ -0,0 +1,54 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@ApiModel +public class AnnouncementVO { + @ApiModelProperty(value = "面试候选人list") + List InterviewCandidatesList; + + @ApiModelProperty(value = "预计入职的list") + List ExpectedEntryList; + + + @Data + @Accessors(chain = true) + @ApiModel + public static class InterviewCandidates { + @ApiModelProperty("时间") + private String timeContent; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("状态") + private String type; + + @ApiModelProperty("岗位") + private String postName; + + @ApiModelProperty("初试结果") + private String firstResult; + + @ApiModelProperty("终试结果") + private String finalResult; + } + + @Data + @Accessors(chain = true) + @ApiModel + public static class ExpectedEntry { + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("岗位") + private String post; + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ApprovedResultVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ApprovedResultVO.java new file mode 100644 index 0000000..7ce78a8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ApprovedResultVO.java @@ -0,0 +1,21 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class ApprovedResultVO { + @ApiModelProperty("审批的单据id") + private String taskId; + @ApiModelProperty("审批结果:approved->同意;refuse->拒绝;repulse->打回") + private String result; + @ApiModelProperty("审批备注") + private String remark; + @ApiModelProperty("hr的用户id;如果需要打回,则需要选择一个hr进行修改。") + private Long userId; + @ApiModelProperty("岗位公海的id,非真正的岗位id") + private String postId; + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EditRecortVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EditRecortVO.java new file mode 100644 index 0000000..914caf8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EditRecortVO.java @@ -0,0 +1,22 @@ +package com.zeroerr.recruit.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +@Data +@ApiModel +public class EditRecortVO { + @ApiModelProperty(value = "日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate date; + + @ApiModelProperty(value = "名字") + private String name; + + @ApiModelProperty(value = "打回/修改记录") + private String remark; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EntryStatisticsVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EntryStatisticsVO.java new file mode 100644 index 0000000..8abfa30 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/EntryStatisticsVO.java @@ -0,0 +1,20 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel +public class EntryStatisticsVO { + @ApiModelProperty(value = "预计入职人数") + List expectEntryCounts; + + @ApiModelProperty(value = "确认入职人数") + List confirmEntryCounts; + + @ApiModelProperty(value = "拒绝入职人数") + List refuseEntryCounts; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/FollowVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/FollowVO.java new file mode 100644 index 0000000..aa14aca --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/FollowVO.java @@ -0,0 +1,141 @@ +package com.zeroerr.recruit.domain.vo; + + +import com.zeroerr.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + + +@ApiModel +@Data +public class FollowVO { + + @ApiModelProperty(value = "部门id") + private Long deptId; + + @ApiModelProperty(value = "部门名字") + @Excel(name = "部门") + private String deptName; + + @ApiModelProperty(value = "岗位id") + private Long postId; + + @ApiModelProperty(value = "岗位名字") + @Excel(name = "岗位") + private String postName; + + @ApiModelProperty(value = "招聘等级") + @Excel(name = "招聘等级",dictType = "recruit_post_grade") + private String grade; + +// /** +// * 招聘时间 +// */ +// @TableField(value = "recruit_date") +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// private LocalDate recruitDate; + + @ApiModelProperty(value = "需求人数") + @Excel(name = "需求人数") + private Integer postCount; + +// /** +// * 招聘优先级 +// */ +// @TableField(value = "grade") +// private Integer grade; + +// /** +// * 约面目标 +// */ +// @TableField(value = "interview_count") +// private Integer interviewCount; +// +// /** +// * 面试通过目标 +// */ +// @TableField(value = "pass_count_target") +// private Integer passCountTarget; + + @ApiModelProperty(value = "主动打招呼数") + @Excel(name = "主动打招呼数") + private Integer lookResumeCount; + + @ApiModelProperty(value = "合格简历数") + @Excel(name = "合格简历数") + private Integer passResumeCount; + + @ApiModelProperty(value = "约面人数") + @Excel(name = "约面人数") + private Integer inviteInterviewCount; + + @ApiModelProperty(value = "接受邀约人数") + private Integer acceptInviteCount; + + @ApiModelProperty(value = "一面人数") + @Excel(name = "初试数") + private Long firstInterviewCount; + + @ApiModelProperty(value = "二面人数") + private Long secondInterviewCount; + + @ApiModelProperty(value = "三面人数") + @Excel(name = "终试数") + private Long thirdInterviewCount; + + @ApiModelProperty(value = "谈薪人数") + @Excel(name = "终试通过人数") + private Long salaryCount; + + @ApiModelProperty(value = "offer人数") + @Excel(name = "接受offer人数") + private Integer offerCount; + + @ApiModelProperty(value = "入职人数") + @Excel(name = "入职人数") + private Integer entryCount; + +// @ApiModelProperty(value = "离职人数") +// private Long leaveCount; + +// @ApiModelProperty(value = "实际到面人数") +// private Long actualCount; + +// /** +// * 周初人数 +// */ +// @TableField(value = "early_week_count") +// private Integer earlyWeekCount; +// +// /** +// * 周末人数 +// */ +// @TableField(value = "late_week_count") +// private Integer lateWeekCount; +// +// /** +// * 离职率 +// */ +// @TableField(value = "leave_percent") +// private Integer leavePercent; + + @ApiModelProperty(value = "负责人id") + private Long hrId; + + @ApiModelProperty(value = "负责人名字") + private String hrName; + + @ApiModelProperty(value = "到面率") + @Excel(name = "到面率(%)") + private Double arriveRate; + + @ApiModelProperty(value = "招聘达成率") + @Excel(name = "招聘达成率(%)") + private Double achievementRate; + + + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/InterViewTagVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/InterViewTagVO.java new file mode 100644 index 0000000..97ee29c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/InterViewTagVO.java @@ -0,0 +1,21 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@ApiModel +@Data +public class InterViewTagVO { + @ApiModelProperty("标签值") + private Long value; + + @ApiModelProperty("标签名") + private String label; + + @ApiModelProperty("子节点") + private List children; + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/PostListVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/PostListVO.java new file mode 100644 index 0000000..c5ff8e8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/PostListVO.java @@ -0,0 +1,18 @@ +package com.zeroerr.recruit.domain.vo; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class PostListVO { + @ApiModelProperty(value = "通过审批的岗位id") + private Long postId; + + @ApiModelProperty(value = "通过审批的岗位名字") + private String postName; + + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ResumeStatVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ResumeStatVO.java new file mode 100644 index 0000000..681503a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/ResumeStatVO.java @@ -0,0 +1,120 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@ApiModel +public class ResumeStatVO { + @ApiModelProperty(value = "合格简历数量") + private Integer qualifiedCount; + + @ApiModelProperty(value = "初试人数") + private Long fistCount; + + @ApiModelProperty(value = "通过人数(终面)") + private Long finalPassCount; + + @ApiModelProperty(value = "未通过人数(终面)") + private Long finalFailCount; + + @ApiModelProperty(value = "入职人数") + private Integer entryCount; +// +// @ApiModelProperty(value = "内推数") +// private Integer internalRecommendedSize; +// +// @ApiModelProperty(value = "内竞数") +// private Integer internalCompetitionSize; + + @ApiModelProperty(value = "通过比例(终面)") + private Double passPercent; + + @ApiModelProperty(value = "入职比例") + private Double entryPercent; + + @ApiModelProperty(value = "到面率") + private Double arrivePercent; + + @ApiModelProperty(value = "简历合格率") + private Double qualifiedPercent; + + @ApiModelProperty(value = "约面率") + private Double invitePercent; + + @ApiModelProperty(value = "某月份,某岗位查看简历数") + private List postLookResumeCounts; + + @ApiModelProperty(value = "某月份,某岗位合格简历数") + private List postQualifiedResumeCounts; + + @ApiModelProperty(value = "某月份,某岗位简历自投数") + private List postSelfCounts; + + @ApiModelProperty(value = "某月份,某岗位简历下载数") + private List postDownLoadCounts; + + @ApiModelProperty(value = "某月份,某岗位约面人数") + private List postInviteCounts; + + @ApiModelProperty(value = "某月份,某岗位到面人数") + private List postArriveCounts; + + @ApiModelProperty(value = "某月份,某岗位终面人数") + private List postFinalCounts; + + @ApiModelProperty(value = "某月份,某岗位入职人数") + private List postEntryCounts; + + @ApiModelProperty(value = "某月份,岗位名字") + private List postNameList; + + @ApiModelProperty(value = "某月份,岗位ids") + private List postIdsList; + + @ApiModelProperty(value = "锥形图数据") + private List funnelData; + + @ApiModelProperty(value = "待我审批") + private Integer waitProcess; + + @ApiModelProperty(value = "我已审批") + private Integer haveProcess; + + @ApiModelProperty(value = "我的申请") + private Integer myProcess; + + @ApiModelProperty(value = "待我招聘") + private Integer waitRecruit; + + @ApiModelProperty(value = "找简历数") + private Integer findResumeCounts; + + @ApiModelProperty(value = "自投数量") + private Integer selfCounts; + + @ApiModelProperty(value = "下载数量") + private Long downLoadCounts; + + @ApiModelProperty(value = "约面数量") + private Integer investInterviewCounts; + + @ApiModelProperty(value = "实际到面人数") + private Long actualArriveCounts; + + @Data + @Accessors(chain = true) + @ApiModel + public static class FunnelData { + @ApiModelProperty(value = "值") + private Long value; + + @ApiModelProperty(value = "命名") + private String name; + } + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureMapVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureMapVO.java new file mode 100644 index 0000000..67b45a5 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureMapVO.java @@ -0,0 +1,16 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class StructureMapVO { + + @ApiModelProperty("节点id") + private Integer id; + + @ApiModelProperty("部门名字") + private String label; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructurePostVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructurePostVO.java new file mode 100644 index 0000000..0c8cbb4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructurePostVO.java @@ -0,0 +1,14 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class StructurePostVO { + @ApiModelProperty("部门id") + private Long structurePostId; + @ApiModelProperty("部门名字") + private String postName; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureVO.java new file mode 100644 index 0000000..0f98dd6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/StructureVO.java @@ -0,0 +1,14 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class StructureVO { + @ApiModelProperty("部门id") + private Long deptId; + @ApiModelProperty("部门名字") + private String deptName; +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/UserVO.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/UserVO.java new file mode 100644 index 0000000..43ddb6c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/domain/vo/UserVO.java @@ -0,0 +1,16 @@ +package com.zeroerr.recruit.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel +public class UserVO { + @ApiModelProperty(value = "用户id") + private Long userId; + + @ApiModelProperty(value = "用户名字") + private String name; + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/EntryManageMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/EntryManageMapper.java new file mode 100644 index 0000000..8a3791f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/EntryManageMapper.java @@ -0,0 +1,35 @@ +package com.zeroerr.recruit.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.dto.EntryManagerDTO; +import com.zeroerr.recruit.domain.entity.EntryManage; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【entry_manage】的数据库操作Mapper +* @createDate 2024-06-25 10:07:23 +* @Entity cn.zeroerr.domain.entity.EntryManage +*/ +@Repository +public interface EntryManageMapper extends BaseMapper { + + List listBySelect(@Param("req") EntryManagerDTO req); + + List getList(@Param("firstDay") LocalDate firstDay, @Param("lastDay") LocalDate lastDay); + + List getListByWeek(@Param("now") LocalDate now, @Param("plusDays") LocalDate plusDays); + + List listByYear(@Param("year") String year); + + List getOfferCounts(@Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/InterviewTagMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/InterviewTagMapper.java new file mode 100644 index 0000000..da9e0ad --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/InterviewTagMapper.java @@ -0,0 +1,21 @@ +package com.zeroerr.recruit.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.InterviewTag; +import org.springframework.stereotype.Repository; + +/** +* @author Ze-java +* @description 针对表【interview_tag】的数据库操作Mapper +* @createDate 2024-06-29 10:01:59 +* @Entity cn.zeroerr.domain.entity.InterviewTag +*/ +@Repository +public interface InterviewTagMapper extends BaseMapper { + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostGradeMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostGradeMapper.java new file mode 100644 index 0000000..24f7409 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostGradeMapper.java @@ -0,0 +1,24 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.PostGrade; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_grade】的数据库操作Mapper +* @createDate 2024-07-05 09:21:29 +* @Entity cn.zeroerr.domain.entity.PostGrade +*/ +public interface PostGradeMapper extends BaseMapper { + + List listBySelect(@Param("req") PostGrade req); + + List listByMonth(@Param("month") String month, @Param("grade") Integer grade,@Param("hrName") String hrName,@Param("postName") String postName); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostPlanFollowMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostPlanFollowMapper.java new file mode 100644 index 0000000..6d0816d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/PostPlanFollowMapper.java @@ -0,0 +1,25 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.PostPlanFollow; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_plan_follow】的数据库操作Mapper +* @createDate 2024-05-27 16:39:21 +* @Entity cn.zeroerr.domain.entity.PostPlanFollow +*/ +@Repository +public interface PostPlanFollowMapper extends BaseMapper { + + List listBySelect(PostPlanFollow req); + + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitPostMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitPostMapper.java new file mode 100644 index 0000000..c0420c8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitPostMapper.java @@ -0,0 +1,30 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.RecruitPost; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Mapper +* @createDate 2024-07-04 18:15:51 +* @Entity cn.zeroerr.domain.entity.RecruitPost +*/ +@Repository +public interface RecruitPostMapper extends BaseMapper { + + List listPostSea(@Param("req") RecruitPost req); + + void updateBindHR(@Param("userId") Long userId, @Param("nickName") String nickName, @Param("postId") String postId); + + List listMyPost(@Param("userId") Long userId); + + void updateUnBindHR(@Param("postId") String postId); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskMapper.java new file mode 100644 index 0000000..6891d1b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskMapper.java @@ -0,0 +1,53 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_process_task(岗位申请单据表)】的数据库操作Mapper +* @createDate 2024-05-14 11:58:45 +* @Entity cn.zeroerr.domain.entity.RecruitProcessTask +*/ +@Repository +public interface RecruitProcessTaskMapper extends BaseMapper { + + List list(@Param("task") RecruitProcessTask task,@Param("userId") Long userId); + + RecruitProcessTask getByTaskId(String taskId); + + int cancel(String taskId); + + List listPending(@Param("task") RecruitProcessTask task, @Param("userId") Long userId); + + void handleApproved(@Param("req") ApprovedResultVO req); + + void handleRepulse(@Param("req")ApprovedResultVO req); + + void handleEdit( @Param("taskId") String taskId); + + List listApproved(@Param("task")RecruitProcessTask task,@Param("userId") Long userId); + + List listPostSea( RecruitProcessTask task); + + void updateBindHR(@Param("userId") Long userId,@Param("userName") String userName, @Param("taskId") String taskId); + + List listMyPost(RecruitProcessTask task); + + List getMyPostList(@Param("userId") Long userId, @Param("status")String status); + + void updateReapply(@Param("taskId") String taskId); + + void updateUnBindHR(@Param("taskId") String taskId); + + List listAllPass(RecruitProcessTask task); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskNodeMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskNodeMapper.java new file mode 100644 index 0000000..441272d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/RecruitProcessTaskNodeMapper.java @@ -0,0 +1,33 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.entity.RecruitProcessTaskNode; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_process_task_node(流程节点表)】的数据库操作Mapper +* @createDate 2024-05-14 11:59:14 +* @Entity cn.zeroerr.domain.entity.RecruitProcessTaskNode +*/ +@Repository +public interface RecruitProcessTaskNodeMapper extends BaseMapper { + + RecruitProcessTaskNode getNodeByTaskId(@Param("taskId") String taskId); + + void handle(@Param("req") ApprovedResultVO req, @Param("nodeId") String nodeId); + + + void handleEdit(@Param("remark") String remark, @Param("nodeId")String nodeId, @Param("auditTime")LocalDateTime auitTime, @Param("status")String status); + + List selectEditRecordList(@Param("taskId") String taskId); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeFollowRecordMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeFollowRecordMapper.java new file mode 100644 index 0000000..4c223d6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeFollowRecordMapper.java @@ -0,0 +1,44 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.entity.ResumeFollowRecord; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_follow_record】的数据库操作Mapper +* @createDate 2024-05-23 19:53:55 +* @Entity cn.zeroerr.domain.entity.ResumeFollowRecord +*/ +@Repository +public interface ResumeFollowRecordMapper extends BaseMapper { + + List listByQuery(@Param("req") ResumeFollowRecord req); + + List getBySelect(@Param("hrId") Long hrId, @Param("firstDay") LocalDate firstDay,@Param("endDay") LocalDate lastDay); + + List getPostInterViewList(@Param("postList") List postList,@Param("firstDay") LocalDate firstDay, @Param("lastDay") LocalDate lastDay); + + List getPostEntryList(@Param("postList") List postList, @Param("firstDay") LocalDate firstDay, @Param("lastDay")LocalDate lastDay); + + List listBySelect(@Param("req") FollowDTO req); + + List getBySelectMonth(@Param("hrName") String hrName, @Param("firstDay") LocalDate firstDay, @Param("lastDay") LocalDate lastDay, @Param("i") int i); + + List getListByWeek(@Param("now") LocalDate now, @Param("plusDays") LocalDate plusDays); + + List getFirstInterviewList(@Param("now") LocalDate yesterday, @Param("plusDays") LocalDate plusDays); + + List getFirstAndFinalInterviewList(@Param("now")LocalDate yesterday, @Param("plusDays")LocalDate plusDays); + + List getFinalInterviewList(@Param("now")LocalDate yesterday, @Param("plusDays")LocalDate plusDays); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeHandleRecordMapper.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeHandleRecordMapper.java new file mode 100644 index 0000000..adc9d19 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/mapper/ResumeHandleRecordMapper.java @@ -0,0 +1,31 @@ +package com.zeroerr.recruit.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.dto.RecordListDTO; +import com.zeroerr.recruit.domain.entity.ResumeHandleRecord; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_handle_record(简历处理记录)】的数据库操作Mapper +* @createDate 2024-05-22 14:25:01 +* @Entity cn.zeroerr.domain.entity.ResumeHandleRecord +*/ +@Repository +public interface ResumeHandleRecordMapper extends BaseMapper { + + List listByCondition(@Param("req") RecordListDTO req); + + List getBySelect(@Param("hrId")Long hrId, @Param("firstDay")LocalDate firstDay, @Param("lastDay")LocalDate lastDay); + + List listBySelect(@Param("req") FollowDTO req); +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/EntryManageService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/EntryManageService.java new file mode 100644 index 0000000..f993e63 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/EntryManageService.java @@ -0,0 +1,28 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.dto.EntryManagerDTO; +import com.zeroerr.recruit.domain.entity.EntryManage; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【entry_manage】的数据库操作Service +* @createDate 2024-06-25 10:07:23 +*/ +public interface EntryManageService extends IService { + + + List listBySelect(EntryManagerDTO req); + + List getList(LocalDate firstDay, LocalDate lastDay); + + List getListByWeek(LocalDate now, LocalDate plusDays); + + List listByYear(String year); + + List getOfferCounts(LocalDate startDate, LocalDate endDate); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/InterviewTagService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/InterviewTagService.java new file mode 100644 index 0000000..72582a6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/InterviewTagService.java @@ -0,0 +1,14 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.InterviewTag; + +/** +* @author Ze-java +* @description 针对表【interview_tag】的数据库操作Service +* @createDate 2024-06-29 10:01:59 +*/ +public interface InterviewTagService extends IService { + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostGradeService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostGradeService.java new file mode 100644 index 0000000..7f34047 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostGradeService.java @@ -0,0 +1,19 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.PostGrade; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_grade】的数据库操作Service +* @createDate 2024-07-05 09:21:29 +*/ +public interface PostGradeService extends IService { + + List listBySelect(PostGrade req); + + List listByMonth(String month, Integer grade,String hrName,String postName); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostPlanFollowService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostPlanFollowService.java new file mode 100644 index 0000000..958538e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/PostPlanFollowService.java @@ -0,0 +1,19 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.PostPlanFollow; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_plan_follow】的数据库操作Service +* @createDate 2024-05-27 16:39:21 +*/ +public interface PostPlanFollowService extends IService { + + List listBySelect(PostPlanFollow req); + + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitPostService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitPostService.java new file mode 100644 index 0000000..97a31d3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitPostService.java @@ -0,0 +1,26 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.RecruitPost; +import com.zeroerr.system.api.domain.RecruitStructure; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Service +* @createDate 2024-07-04 18:15:51 +*/ +public interface RecruitPostService extends IService { + + List listPostSea(RecruitPost req); + + void updateBindHR(Long userId, String nickName, String postId); + + List listMyPost(Long userId); + + void updateUnBindHR(String postId); + + void newRecruitPost(RecruitStructure node, Long deptId, String deptName); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskNodeService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskNodeService.java new file mode 100644 index 0000000..a0926e8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskNodeService.java @@ -0,0 +1,26 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.RecruitProcessTaskNode; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_process_task_node(流程节点表)】的数据库操作Service +* @createDate 2024-05-14 11:59:14 +*/ +public interface RecruitProcessTaskNodeService extends IService { + + RecruitProcessTaskNode getNodeByTaskId(String taskId); + + void handle(ApprovedResultVO req, String nodeId); + + + void handleEdit(String remark, String nodeId, LocalDateTime now, String name); + + List selectEditRecordList(String taskId); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskService.java new file mode 100644 index 0000000..8d34257 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/RecruitProcessTaskService.java @@ -0,0 +1,50 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_process_task(岗位申请单据表)】的数据库操作Service +* @createDate 2024-05-14 11:58:45 +*/ +public interface RecruitProcessTaskService extends IService { + + int handleAddTask(RecruitProcessTask task) ; + + List list(RecruitProcessTask task, Long userId); + + RecruitProcessTask getByTaskId(String taskId); + + int cancel(String taskId); + + List listPending(RecruitProcessTask task, Long userId); + + void handleApproved(ApprovedResultVO req); + + + void handleRepulse(ApprovedResultVO req); + + void handleEdit( String taskId); + + List listApproved(RecruitProcessTask task, Long userId); + + List listPostSea(RecruitProcessTask task); + + void updateBindHR(Long userId, String userName, String taskId); + + List listMyPost(RecruitProcessTask task); + + List getMyPostList(Long userId, String name); + + + void updateReapply(String taskId); + + void updateUnBindHR(String taskId); + + List listAllPass(RecruitProcessTask task); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeFollowRecordService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeFollowRecordService.java new file mode 100644 index 0000000..bcac976 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeFollowRecordService.java @@ -0,0 +1,38 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.entity.ResumeFollowRecord; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_follow_record】的数据库操作Service +* @createDate 2024-05-23 19:53:55 +*/ +public interface ResumeFollowRecordService extends IService { + + List listByQuery(ResumeFollowRecord req); + + List getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay); + + List getPostInterViewList(List postList, LocalDate firstDay, LocalDate lastDay); + + List getPostEntryList(List postList, LocalDate firstDay, LocalDate lastDay); + + List listBySelect(FollowDTO req); + + + List getBySelectMonth(String hrName, LocalDate firstDay, LocalDate lastDay, int i); + + List getListByWeek(LocalDate now, LocalDate plusDays); + + List getFirstInterviewList(LocalDate yesterday, LocalDate plusDays); + + List getFirstAndFinalInterviewList(LocalDate yesterday, LocalDate plusDays); + + List getFinalInterviewList(LocalDate yesterday, LocalDate plusDays); +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeHandleRecordService.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeHandleRecordService.java new file mode 100644 index 0000000..0c7e59c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/ResumeHandleRecordService.java @@ -0,0 +1,27 @@ +package com.zeroerr.recruit.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.dto.RecordListDTO; +import com.zeroerr.recruit.domain.entity.ResumeHandleRecord; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_handle_record(简历处理记录)】的数据库操作Service +* @createDate 2024-05-22 14:25:01 +*/ +public interface ResumeHandleRecordService extends IService { + + + List listByCondition(RecordListDTO req); + + List getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay); + + List listBySelect(FollowDTO req); + + +} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/EntryManageServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/EntryManageServiceImpl.java new file mode 100644 index 0000000..9fd2e9b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/EntryManageServiceImpl.java @@ -0,0 +1,50 @@ +package com.zeroerr.recruit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.dto.EntryManagerDTO; +import com.zeroerr.recruit.domain.entity.EntryManage; +import com.zeroerr.recruit.mapper.EntryManageMapper; +import com.zeroerr.recruit.service.EntryManageService; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【entry_manage】的数据库操作Service实现 +* @createDate 2024-06-25 10:07:23 +*/ +@Service +public class EntryManageServiceImpl extends ServiceImpl + implements EntryManageService { + + @Override + public List listBySelect(EntryManagerDTO req) { + return this.baseMapper.listBySelect(req); + } + + @Override + public List getList(LocalDate firstDay, LocalDate lastDay) { + return baseMapper.getList(firstDay,lastDay); + } + + @Override + public List getListByWeek(LocalDate now, LocalDate plusDays) { + return this.baseMapper.getListByWeek(now,plusDays); + } + + @Override + public List listByYear(String year) { + return this.baseMapper.listByYear(year); + } + + @Override + public List getOfferCounts(LocalDate startDate, LocalDate endDate) { + return this.baseMapper.getOfferCounts(startDate,endDate); + } +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/InterviewTagServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/InterviewTagServiceImpl.java new file mode 100644 index 0000000..1d5199d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/InterviewTagServiceImpl.java @@ -0,0 +1,22 @@ +package com.zeroerr.recruit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.entity.InterviewTag; +import com.zeroerr.recruit.mapper.InterviewTagMapper; +import com.zeroerr.recruit.service.InterviewTagService; +import org.springframework.stereotype.Service; + +/** +* @author Ze-java +* @description 针对表【interview_tag】的数据库操作Service实现 +* @createDate 2024-06-29 10:01:59 +*/ +@Service +public class InterviewTagServiceImpl extends ServiceImpl + implements InterviewTagService { + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostGradeServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostGradeServiceImpl.java new file mode 100644 index 0000000..0938cbf --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostGradeServiceImpl.java @@ -0,0 +1,34 @@ +package com.zeroerr.recruit.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.entity.PostGrade; +import com.zeroerr.recruit.mapper.PostGradeMapper; +import com.zeroerr.recruit.service.PostGradeService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_grade】的数据库操作Service实现 +* @createDate 2024-07-05 09:21:29 +*/ +@Service +public class PostGradeServiceImpl extends ServiceImpl + implements PostGradeService { + + @Override + public List listBySelect(PostGrade req) { + return this.baseMapper.listBySelect(req); + } + + @Override + public List listByMonth(String month, Integer grade,String hrName,String postName) { + return this.baseMapper.listByMonth(month,grade,hrName,postName); + } +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostPlanFollowServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostPlanFollowServiceImpl.java new file mode 100644 index 0000000..a80b28b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/PostPlanFollowServiceImpl.java @@ -0,0 +1,35 @@ +package com.zeroerr.recruit.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.entity.PostPlanFollow; +import com.zeroerr.recruit.mapper.PostPlanFollowMapper; +import com.zeroerr.recruit.service.PostPlanFollowService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【post_plan_follow】的数据库操作Service实现 +* @createDate 2024-05-27 16:39:21 +*/ +@Service +public class PostPlanFollowServiceImpl extends ServiceImpl + implements PostPlanFollowService { + + @Autowired + private PostPlanFollowMapper postPlanFollowMapper; + + @Override + public List listBySelect(PostPlanFollow req) { + return postPlanFollowMapper.listBySelect(req); + } + + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitPostServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitPostServiceImpl.java new file mode 100644 index 0000000..8fdb167 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitPostServiceImpl.java @@ -0,0 +1,68 @@ +package com.zeroerr.recruit.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.entity.RecruitPost; +import com.zeroerr.recruit.mapper.RecruitPostMapper; +import com.zeroerr.recruit.service.RecruitPostService; +import com.zeroerr.system.api.domain.RecruitStructure; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_post(审批通过要招娉的岗位表)】的数据库操作Service实现 +* @createDate 2024-07-04 18:15:51 +*/ +@Service +public class RecruitPostServiceImpl extends ServiceImpl + implements RecruitPostService { + + @Override + public List listPostSea(RecruitPost req) { + return this.baseMapper.listPostSea(req); + } + + @Override + public void updateBindHR(Long userId, String nickName, String postId) { + this.baseMapper.updateBindHR(userId,nickName,postId); + } + + @Override + public List listMyPost(Long userId) { + return this.baseMapper.listMyPost(userId); + } + + @Override + public void updateUnBindHR(String postId) { + this.baseMapper.updateUnBindHR(postId); + } + + @Override + public void newRecruitPost(RecruitStructure node, Long deptId, String deptName) { + RecruitPost recruitPost = new RecruitPost(); + recruitPost.setNodeId(node.getNodeId()); + recruitPost.setPostName(node.getNodeName()); + recruitPost.setDeptId(deptId); + recruitPost.setDeptName(deptName); + recruitPost.setIsAllocation(0); + recruitPost.setCreateTime(LocalDate.now()); +// RecruitPost recruitPost = RecruitPost.builder() +// .nodeId(node.getNodeId()) +// .postName(node.getNodeName()) +// .deptId(deptId) +// .deptName(deptName) +// //默认未分配 +// .isAllocation(0) +// .createTime(LocalDate.now()) +// .build(); + + this.baseMapper.insert(recruitPost); + } +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskNodeServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskNodeServiceImpl.java new file mode 100644 index 0000000..16cc4ed --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskNodeServiceImpl.java @@ -0,0 +1,50 @@ +package com.zeroerr.recruit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.entity.RecruitProcessTaskNode; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; +import com.zeroerr.recruit.mapper.RecruitProcessTaskNodeMapper; +import com.zeroerr.recruit.service.RecruitProcessTaskNodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【recruit_process_task_node(流程节点表)】的数据库操作Service实现 +* @createDate 2024-05-14 11:59:14 +*/ +@Service +public class RecruitProcessTaskNodeServiceImpl extends ServiceImpl + implements RecruitProcessTaskNodeService { + @Autowired + private RecruitProcessTaskNodeMapper recruitProcessTaskNodeMapper; + + @Override + public RecruitProcessTaskNode getNodeByTaskId(String taskId) { + return recruitProcessTaskNodeMapper.getNodeByTaskId(taskId); + } + + @Override + public void handle(ApprovedResultVO req, String nodeId) { + recruitProcessTaskNodeMapper.handle(req,nodeId); + } + + @Override + public void handleEdit(String remark, String nodeId, LocalDateTime auditTime, String status) { + recruitProcessTaskNodeMapper.handleEdit(remark,nodeId,auditTime,status); + } + + @Override + public List selectEditRecordList(String taskId) { + return recruitProcessTaskNodeMapper.selectEditRecordList(taskId); + } + + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskServiceImpl.java new file mode 100644 index 0000000..ee3e58f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/RecruitProcessTaskServiceImpl.java @@ -0,0 +1,195 @@ +package com.zeroerr.recruit.service.impl; + + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.common.core.enums.ProcessAction; +import com.zeroerr.common.core.enums.ProcessTaskNodeStatus; +import com.zeroerr.common.core.enums.ProcessTaskStatus; +import com.zeroerr.recruit.domain.entity.RecruitProcessTask; +import com.zeroerr.recruit.domain.entity.RecruitProcessTaskNode; +import com.zeroerr.recruit.domain.vo.ApprovedResultVO; +import com.zeroerr.recruit.mapper.RecruitProcessTaskMapper; +import com.zeroerr.recruit.service.RecruitProcessTaskNodeService; +import com.zeroerr.recruit.service.RecruitProcessTaskService; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.service.ISysDeptService; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; +import com.zeroerr.system.service.RecruitStructureService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Ze-java + * @description 针对表【recruit_process_task(岗位申请单据表)】的数据库操作Service实现 + * @createDate 2024-05-14 11:58:45 + */ +@Service +public class RecruitProcessTaskServiceImpl extends ServiceImpl + implements RecruitProcessTaskService { + @Autowired + private RecruitProcessTaskMapper recruitProcessTaskMapper; + + @Autowired + private RecruitProcessTaskNodeService recruitProcessTaskNodeService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private ISysRoleService iSysRoleService; + + @Autowired + private ISysDeptService iSysDeptService; + + @Autowired + private RecruitStructureService recruitStructureService; + + /** + * 新增招聘岗位申请 + */ + @Override + @Transactional + public int handleAddTask(RecruitProcessTask task) { + task.setStatus(ProcessTaskStatus.process.name()); + //设置成未修改 + task.setEdit(1); + //新增单据表 + int insert = recruitProcessTaskMapper.insert(task); + //构造流程节点表 + List recruitProcessTaskNodeList = handleTaskNode(task); + boolean b = recruitProcessTaskNodeService.saveBatch(recruitProcessTaskNodeList); + + //将组织架构里,该岗位节点,变成审批中状态 + recruitStructureService.updatePostType(task.getStructurePostId(),1,task.getTaskId()); + + if(!(insert==1&&b)){ + return 0; + } + return insert; + } + + @Override + public List list(RecruitProcessTask task, Long userId) { + return recruitProcessTaskMapper.list(task,userId); + } + + @Override + public RecruitProcessTask getByTaskId(String taskId) { + return recruitProcessTaskMapper.getByTaskId(taskId); + } + + @Override + public int cancel(String taskId) { + return recruitProcessTaskMapper.cancel(taskId); + } + + @Override + public List listPending(RecruitProcessTask task, Long userId) { + return recruitProcessTaskMapper.listPending(task,userId); + } + + @Override + public void handleApproved(ApprovedResultVO req) { + recruitProcessTaskMapper.handleApproved(req); + } + + @Override + public void handleRepulse(ApprovedResultVO req) { + recruitProcessTaskMapper.handleRepulse(req); + } + + @Override + public void handleEdit( String taskId) { + recruitProcessTaskMapper.handleEdit(taskId); + } + + @Override + public List listApproved(RecruitProcessTask task, Long userId) { + return recruitProcessTaskMapper.listApproved(task,userId); + } + + @Override + public List listPostSea(RecruitProcessTask task) { + return recruitProcessTaskMapper.listPostSea(task); + } + + @Override + public void updateBindHR(Long userId, String userName, String taskId) { + recruitProcessTaskMapper.updateBindHR(userId,userName,taskId); + } + + @Override + public List listMyPost(RecruitProcessTask task) { + return recruitProcessTaskMapper.listMyPost(task); + } + + @Override + public List getMyPostList(Long userId, String status) { + return recruitProcessTaskMapper.getMyPostList(userId,status); + } + + @Override + public void updateReapply(String taskId) { + recruitProcessTaskMapper.updateReapply(taskId); + } + + @Override + public void updateUnBindHR(String taskId) { + recruitProcessTaskMapper.updateUnBindHR(taskId); + } + + @Override + public List listAllPass(RecruitProcessTask task) { + return recruitProcessTaskMapper.listAllPass(task); + } + + + /** + * 处理流程节点 + */ + private List handleTaskNode(RecruitProcessTask task) { + List recruitProcessTaskNodeList = new ArrayList<>(); + RecruitProcessTaskNode recruitProcessTaskNodeFirst = RecruitProcessTaskNode.builder() + .nodeId(String.valueOf(IdWorker.getId())) + .taskId(task.getTaskId()) + .operatorId(task.getUserId()) + .operatorName(task.getUserName()) + .action(ProcessAction.apply.name()) + .deptId(task.getUserDeptId()) + .deptName(task.getDeptName()) + .orderNum(0) + .auditTime(LocalDateTime.now()).build(); + recruitProcessTaskNodeList.add(recruitProcessTaskNodeFirst); + + //设置第二个节点:老板(角色为ceo的) + SysRole sysRole = iSysRoleService.getBoss(); + SysUser user = iSysUserService.getUser(sysRole.getRoleId()); + SysDept sysDept = iSysDeptService.selectDeptById(user.getDeptId()); + RecruitProcessTaskNode recruitProcessTaskNodeSecond = RecruitProcessTaskNode.builder() + .nodeId(String.valueOf(IdWorker.getId())) + .taskId(task.getTaskId()) + .operatorId(user.getUserId()) + .operatorName(user.getNickName()) + .status(ProcessTaskNodeStatus.process.name()) + .action(ProcessAction.audit.name()) + .deptId(user.getDeptId()) + .orderNum(1) + .deptName(sysDept.getDeptName()).build(); + + recruitProcessTaskNodeList.add(recruitProcessTaskNodeSecond); + return recruitProcessTaskNodeList; + } +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeFollowRecordServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeFollowRecordServiceImpl.java new file mode 100644 index 0000000..2aeead4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeFollowRecordServiceImpl.java @@ -0,0 +1,82 @@ +package com.zeroerr.recruit.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.entity.ResumeFollowRecord; +import com.zeroerr.recruit.mapper.ResumeFollowRecordMapper; +import com.zeroerr.recruit.service.ResumeFollowRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_follow_record】的数据库操作Service实现 +* @createDate 2024-05-23 19:53:55 +*/ +@Service +public class ResumeFollowRecordServiceImpl extends ServiceImpl + implements ResumeFollowRecordService { + + @Autowired + private ResumeFollowRecordMapper resumeFollowRecordMapper; + + @Override + public List listByQuery(ResumeFollowRecord req) { + return resumeFollowRecordMapper.listByQuery(req); + } + + @Override + public List getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay) { + return resumeFollowRecordMapper.getBySelect(hrId,firstDay,lastDay); + } + + @Override + public List getPostInterViewList(List postList, LocalDate firstDay, LocalDate lastDay) { + return resumeFollowRecordMapper.getPostInterViewList(postList,firstDay,lastDay); + } + + @Override + public List getPostEntryList(List postList, LocalDate firstDay, LocalDate lastDay) { + return resumeFollowRecordMapper.getPostEntryList(postList,firstDay,lastDay); + } + + @Override + public List listBySelect(FollowDTO req) { + return resumeFollowRecordMapper.listBySelect(req); + } + + @Override + public List getBySelectMonth(String hrName, LocalDate firstDay, LocalDate lastDay, int i) { + return resumeFollowRecordMapper.getBySelectMonth(hrName,firstDay,lastDay,i); + } + + @Override + public List getListByWeek(LocalDate now, LocalDate plusDays) { + return resumeFollowRecordMapper.getListByWeek(now,plusDays); + } + + @Override + public List getFirstInterviewList(LocalDate yesterday, LocalDate plusDays) { + return resumeFollowRecordMapper.getFirstInterviewList(yesterday,plusDays); + } + + @Override + public List getFirstAndFinalInterviewList(LocalDate yesterday, LocalDate plusDays) { + return resumeFollowRecordMapper.getFirstAndFinalInterviewList(yesterday,plusDays); + } + + @Override + public List getFinalInterviewList(LocalDate yesterday, LocalDate plusDays) { + return resumeFollowRecordMapper.getFinalInterviewList(yesterday,plusDays); + } + + +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeHandleRecordServiceImpl.java b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeHandleRecordServiceImpl.java new file mode 100644 index 0000000..f53b225 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/java/com/zeroerr/recruit/service/impl/ResumeHandleRecordServiceImpl.java @@ -0,0 +1,45 @@ +package com.zeroerr.recruit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.recruit.domain.dto.FollowDTO; +import com.zeroerr.recruit.domain.dto.RecordListDTO; +import com.zeroerr.recruit.domain.entity.ResumeHandleRecord; +import com.zeroerr.recruit.mapper.ResumeHandleRecordMapper; +import com.zeroerr.recruit.service.ResumeHandleRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; + +/** +* @author Ze-java +* @description 针对表【resume_handle_record(简历处理记录)】的数据库操作Service实现 +* @createDate 2024-05-22 14:25:01 +*/ +@Service +public class ResumeHandleRecordServiceImpl extends ServiceImpl + implements ResumeHandleRecordService { + + @Autowired + private ResumeHandleRecordMapper resumeHandleRecordMapper; + + @Override + public List listByCondition(RecordListDTO req) { + return resumeHandleRecordMapper.listByCondition(req); + } + + @Override + public List getBySelect(Long hrId, LocalDate firstDay, LocalDate lastDay) { + return resumeHandleRecordMapper.getBySelect(hrId,firstDay,lastDay); + } + + @Override + public List listBySelect(FollowDTO req) { + return resumeHandleRecordMapper.listBySelect(req); + } +} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/banner.txt b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/banner.txt new file mode 100644 index 0000000..fbd45f5 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/bootstrap.yml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..3bd7249 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9204 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-recruit + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/logback.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/logback.xml new file mode 100644 index 0000000..c4dc0f3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/EntryManageMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/EntryManageMapper.xml new file mode 100644 index 0000000..ce56bf3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/EntryManageMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + entry_id,dept_id,dept_name, + post_id,post_name, + user_name,hr_id,hr_name, + final_pass_date,join_date,actual_join_date, + entry_fail_reason,is_entry,file,dossier,rank,regular_date,termination_date + + + + + + + + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/InterviewTagMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/InterviewTagMapper.xml new file mode 100644 index 0000000..521e4b4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/InterviewTagMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + tag_id,parent_id,tag_name + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostGradeMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostGradeMapper.xml new file mode 100644 index 0000000..aebc2d4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostGradeMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + grade_id,post_id,post_name, + apply_date,post_count,grade, + hr_id,hr_name,dept_id, + dept_name,month,create_date, + update_date,cycle,remark + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostPlanFollowMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostPlanFollowMapper.xml new file mode 100644 index 0000000..8b6ce58 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/PostPlanFollowMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,dept_id,dept_name, + post_id,post_name,recruit_date, + ym,week,post_count, + grade,interview_count,pass_count_target, + pass_resume_count,invite_interview_count,first_interview, + second_interview,third_interview,salary_count, + offer_count,entry_count,leave_count, + actual_count,early_week_count,late_week_count, + leave_percent,hr_id,hr_name,create_date,update_date + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitPostMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitPostMapper.xml new file mode 100644 index 0000000..f2405f4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitPostMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + post_id,hr_id,hr_name, + post_name,task_id,node_id, + dept_id,dept_name,create_time, + update_time,is_allocation + + + + + + + update recruit_post set hr_id=#{userId} ,hr_name=#{nickName} ,is_allocation=1 where post_id=#{postId} + + + + + + update recruit_post set hr_id=null ,hr_name=null,is_allocation=0 where post_id=#{postId} + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskMapper.xml new file mode 100644 index 0000000..b8e69ab --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskMapper.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + task_id + ,dept_name,dept_id, + apply_date,post_name,recruit_reason, + post_count,salary,age, + arrive_time,sex,education, + rank,experience,first_interview, + second_interview,final_interview,examination, + recruitment_channel,required_keywords,optional_keywords, + exclusive_requirement,precedence_requirement,position_statement, + post_equirements,check_experience,application_materials, + status,user_id,user_name, + user_dept_id,del_flag,images,edit,complete_time,hr_id,hr_name,structure_post_id + + + + + + + + + update recruit_process_task + set status='cancel' + where task_id = #{taskId} + + + + + UPDATE recruit_process_task + SET status = #{req.result}, + complete_time=CURRENT_TIMESTAMP + WHERE task_id = #{req.taskId} + + + + UPDATE recruit_process_task + SET edit = 3, + status=#{req.result} + WHERE task_id = #{req.taskId} + + + + UPDATE recruit_process_task + SET edit = 2, + status='process' + WHERE task_id = #{taskId} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE recruit_process_task + SET hr_id = #{userId}, + hr_name=#{userName} + WHERE task_id = #{taskId} + + + + + + + + + update recruit_process_task set status='reapply' where task_id=#{taskId} + + + + update recruit_process_task set hr_id=null ,hr_name=null where task_id=#{taskId} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskNodeMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskNodeMapper.xml new file mode 100644 index 0000000..2d2db77 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/RecruitProcessTaskNodeMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + node_id,task_id,operator_id, + operator_name,action,result, + status,dept_id,dept_name, + remark,audit_time,order_num + + + + + update recruit_process_task_node set result =#{req.result},status='complete',remark=#{req.remark} ,audit_time=CURRENT_TIMESTAMP where node_id=#{nodeId} + + + + update recruit_process_task_node set result ='approved',status=#{status},remark=#{remark},audit_time=#{auditTime} + where node_id=#{nodeId} + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeFollowRecordMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeFollowRecordMapper.xml new file mode 100644 index 0000000..514b8ee --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeFollowRecordMapper.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,receive_date,recruitment_channel, + resume_source,name,phone, + post_id,post_name,suit_jd, + hr_id,hr_name,interview_date, + is_pass,invitation_date,rejected_reason, + first_date,first_reach,first_test, + first_interviewer_ids,first_pass,second_date, + second_reach,second_interviewer_ids,second_pass, + final_date,final_reach,final_interviewer_ids, + final_pass,accept_offer,join_date,create_date,update_date,actual_join_date, + fail_reason,special_reason,file,topping,topping_time,tags,is_attend,manager_time + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeHandleRecordMapper.xml b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeHandleRecordMapper.xml new file mode 100644 index 0000000..87419a3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-recruit/src/main/resources/mapper.recruit/ResumeHandleRecordMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + id,post_id,post_name, + handle_date,recruitment_channel,seen_num, + greet_num,submit_num,qualified_num, + receive_invite_num,operator_id,operator_name,dept_id,dept_name,self_counts + + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-system/pom.xml b/zeroerroa-modules/zeroerroa-system/pom.xml new file mode 100644 index 0000000..1a03a9e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/pom.xml @@ -0,0 +1,100 @@ + + + + com.zeroerr + zeroerroa-modules + 3.6.4 + + 4.0.0 + + zeroerroa-modules-system + + + zeroerroa-modules-system系统模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.zeroerr + zeroerroa-common-datasource + + + + + com.zeroerr + zeroerroa-common-datascope + + + + + com.zeroerr + zeroerroa-common-log + + + + + com.zeroerr + zeroerroa-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/ZeroErrSystemApplication.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/ZeroErrSystemApplication.java new file mode 100644 index 0000000..dff91a2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/ZeroErrSystemApplication.java @@ -0,0 +1,34 @@ +package com.zeroerr.system; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.zeroerr.common.security.annotation.EnableCustomConfig; +import com.zeroerr.common.security.annotation.EnableRyFeignClients; +import com.zeroerr.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 系统模块 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class ZeroErrSystemApplication +{ + public static void main(String[] args) + { + SpringApplication.run(ZeroErrSystemApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 系统模块启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysConfigController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysConfigController.java new file mode 100644 index 0000000..fcfb09b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysConfigController.java @@ -0,0 +1,133 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.domain.SysConfig; +import com.zeroerr.system.service.ISysConfigService; + +/** + * 参数配置 信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/config") +public class SysConfigController extends BaseController +{ + @Autowired + private ISysConfigService configService; + + /** + * 获取参数配置列表 + */ + @RequiresPermissions("system:config:list") + @GetMapping("/list") + public TableDataInfo list(SysConfig config) + { + startPage(); + List list = configService.selectConfigList(config); + return getDataTable(list); + } + + @Log(title = "参数管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:config:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysConfig config) + { + List list = configService.selectConfigList(config); + ExcelUtil util = new ExcelUtil(SysConfig.class); + util.exportExcel(response, list, "参数数据"); + } + + /** + * 根据参数编号获取详细信息 + */ + @GetMapping(value = "/{configId}") + public AjaxResult getInfo(@PathVariable Long configId) + { + return success(configService.selectConfigById(configId)); + } + + /** + * 根据参数键名查询参数值 + */ + @GetMapping(value = "/configKey/{configKey}") + public AjaxResult getConfigKey(@PathVariable String configKey) + { + return success(configService.selectConfigByKey(configKey)); + } + + /** + * 新增参数配置 + */ + @RequiresPermissions("system:config:add") + @Log(title = "参数管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysConfig config) + { + if (!configService.checkConfigKeyUnique(config)) + { + return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); + } + config.setCreateBy(SecurityUtils.getUsername()); + return toAjax(configService.insertConfig(config)); + } + + /** + * 修改参数配置 + */ + @RequiresPermissions("system:config:edit") + @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysConfig config) + { + if (!configService.checkConfigKeyUnique(config)) + { + return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); + } + config.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(configService.updateConfig(config)); + } + + /** + * 删除参数配置 + */ + @RequiresPermissions("system:config:remove") + @Log(title = "参数管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public AjaxResult remove(@PathVariable Long[] configIds) + { + configService.deleteConfigByIds(configIds); + return success(); + } + + /** + * 刷新参数缓存 + */ + @RequiresPermissions("system:config:remove") + @Log(title = "参数管理", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + configService.resetConfigCache(); + return success(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDeptController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDeptController.java new file mode 100644 index 0000000..ff92f16 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDeptController.java @@ -0,0 +1,133 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.service.ISysDeptService; + +/** + * 部门信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/dept") +public class SysDeptController extends BaseController +{ + @Autowired + private ISysDeptService deptService; + + /** + * 获取部门列表 + */ + @RequiresPermissions("system:dept:list") + @GetMapping("/list") + public AjaxResult list(SysDept dept) + { + List depts = deptService.selectDeptList(dept); + return success(depts); + } + + /** + * 查询部门列表(排除节点) + */ + @RequiresPermissions("system:dept:list") + @GetMapping("/list/exclude/{deptId}") + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) + { + List depts = deptService.selectDeptList(new SysDept()); + depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); + return success(depts); + } + + /** + * 根据部门编号获取详细信息 + */ + @RequiresPermissions("system:dept:query") + @GetMapping(value = "/{deptId}") + public AjaxResult getInfo(@PathVariable Long deptId) + { + deptService.checkDeptDataScope(deptId); + return success(deptService.selectDeptById(deptId)); + } + + /** + * 新增部门 + */ + @RequiresPermissions("system:dept:add") + @Log(title = "部门管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDept dept) + { + if (!deptService.checkDeptNameUnique(dept)) + { + return error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在"); + } + dept.setCreateBy(SecurityUtils.getUsername()); + return toAjax(deptService.insertDept(dept)); + } + + /** + * 修改部门 + */ + @RequiresPermissions("system:dept:edit") + @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDept dept) + { + Long deptId = dept.getDeptId(); + deptService.checkDeptDataScope(deptId); + if (!deptService.checkDeptNameUnique(dept)) + { + return error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在"); + } + else if (dept.getParentId().equals(deptId)) + { + return error("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己"); + } + else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) + { + return error("该部门包含未停用的子部门!"); + } + dept.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(deptService.updateDept(dept)); + } + + /** + * 删除部门 + */ + @RequiresPermissions("system:dept:remove") + @Log(title = "部门管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{deptId}") + public AjaxResult remove(@PathVariable Long deptId) + { + if (deptService.hasChildByDeptId(deptId)) + { + return warn("存在下级部门,不允许删除"); + } + if (deptService.checkDeptExistUser(deptId)) + { + return warn("部门存在用户,不允许删除"); + } + deptService.checkDeptDataScope(deptId); + return toAjax(deptService.deleteDeptById(deptId)); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictDataController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictDataController.java new file mode 100644 index 0000000..dfe6b0e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictDataController.java @@ -0,0 +1,122 @@ +package com.zeroerr.system.controller; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDictData; +import com.zeroerr.system.service.ISysDictDataService; +import com.zeroerr.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/dict/data") +public class SysDictDataController extends BaseController +{ + @Autowired + private ISysDictDataService dictDataService; + + @Autowired + private ISysDictTypeService dictTypeService; + + @RequiresPermissions("system:dict:list") + @GetMapping("/list") + public TableDataInfo list(SysDictData dictData) + { + startPage(); + List list = dictDataService.selectDictDataList(dictData); + return getDataTable(list); + } + + @Log(title = "字典数据", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:dict:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysDictData dictData) + { + List list = dictDataService.selectDictDataList(dictData); + ExcelUtil util = new ExcelUtil(SysDictData.class); + util.exportExcel(response, list, "字典数据"); + } + + /** + * 查询字典数据详细 + */ + @RequiresPermissions("system:dict:query") + @GetMapping(value = "/{dictCode}") + public AjaxResult getInfo(@PathVariable Long dictCode) + { + return success(dictDataService.selectDictDataById(dictCode)); + } + + /** + * 根据字典类型查询字典数据信息 + */ + @GetMapping(value = "/type/{dictType}") + public AjaxResult dictType(@PathVariable String dictType) + { + List data = dictTypeService.selectDictDataByType(dictType); + if (StringUtils.isNull(data)) + { + data = new ArrayList(); + } + return success(data); + } + + /** + * 新增字典类型 + */ + @RequiresPermissions("system:dict:add") + @Log(title = "字典数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictData dict) + { + dict.setCreateBy(SecurityUtils.getUsername()); + return toAjax(dictDataService.insertDictData(dict)); + } + + /** + * 修改保存字典类型 + */ + @RequiresPermissions("system:dict:edit") + @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictData dict) + { + dict.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(dictDataService.updateDictData(dict)); + } + + /** + * 删除字典类型 + */ + @RequiresPermissions("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictCodes}") + public AjaxResult remove(@PathVariable Long[] dictCodes) + { + dictDataService.deleteDictDataByIds(dictCodes); + return success(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictTypeController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictTypeController.java new file mode 100644 index 0000000..ec2af98 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysDictTypeController.java @@ -0,0 +1,132 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDictType; +import com.zeroerr.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/dict/type") +public class SysDictTypeController extends BaseController +{ + @Autowired + private ISysDictTypeService dictTypeService; + + @RequiresPermissions("system:dict:list") + @GetMapping("/list") + public TableDataInfo list(SysDictType dictType) + { + startPage(); + List list = dictTypeService.selectDictTypeList(dictType); + return getDataTable(list); + } + + @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:dict:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysDictType dictType) + { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil util = new ExcelUtil(SysDictType.class); + util.exportExcel(response, list, "字典类型"); + } + + /** + * 查询字典类型详细 + */ + @RequiresPermissions("system:dict:query") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) + { + return success(dictTypeService.selectDictTypeById(dictId)); + } + + /** + * 新增字典类型 + */ + @RequiresPermissions("system:dict:add") + @Log(title = "字典类型", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictType dict) + { + if (!dictTypeService.checkDictTypeUnique(dict)) + { + return error("新增字典'" + dict.getDictName() + "'失败,字典类型已存在"); + } + dict.setCreateBy(SecurityUtils.getUsername()); + return toAjax(dictTypeService.insertDictType(dict)); + } + + /** + * 修改字典类型 + */ + @RequiresPermissions("system:dict:edit") + @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictType dict) + { + if (!dictTypeService.checkDictTypeUnique(dict)) + { + return error("修改字典'" + dict.getDictName() + "'失败,字典类型已存在"); + } + dict.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(dictTypeService.updateDictType(dict)); + } + + /** + * 删除字典类型 + */ + @RequiresPermissions("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable Long[] dictIds) + { + dictTypeService.deleteDictTypeByIds(dictIds); + return success(); + } + + /** + * 刷新字典缓存 + */ + @RequiresPermissions("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + dictTypeService.resetDictCache(); + return success(); + } + + /** + * 获取字典选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + List dictTypes = dictTypeService.selectDictTypeAll(); + return success(dictTypes); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysLogininforController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysLogininforController.java new file mode 100644 index 0000000..2bc441b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysLogininforController.java @@ -0,0 +1,92 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.common.security.annotation.InnerAuth; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.system.api.domain.SysLogininfor; +import com.zeroerr.system.service.ISysLogininforService; + +/** + * 系统访问记录 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/logininfor") +public class SysLogininforController extends BaseController +{ + @Autowired + private ISysLogininforService logininforService; + + @Autowired + private RedisService redisService; + + @RequiresPermissions("system:logininfor:list") + @GetMapping("/list") + public TableDataInfo list(SysLogininfor logininfor) + { + startPage(); + List list = logininforService.selectLogininforList(logininfor); + return getDataTable(list); + } + + @Log(title = "登录日志", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:logininfor:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysLogininfor logininfor) + { + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil util = new ExcelUtil(SysLogininfor.class); + util.exportExcel(response, list, "登录日志"); + } + + @RequiresPermissions("system:logininfor:remove") + @Log(title = "登录日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{infoIds}") + public AjaxResult remove(@PathVariable Long[] infoIds) + { + return toAjax(logininforService.deleteLogininforByIds(infoIds)); + } + + @RequiresPermissions("system:logininfor:remove") + @Log(title = "登录日志", businessType = BusinessType.DELETE) + @DeleteMapping("/clean") + public AjaxResult clean() + { + logininforService.cleanLogininfor(); + return success(); + } + + @RequiresPermissions("system:logininfor:unlock") + @Log(title = "账户解锁", businessType = BusinessType.OTHER) + @GetMapping("/unlock/{userName}") + public AjaxResult unlock(@PathVariable("userName") String userName) + { + redisService.deleteObject(CacheConstants.PWD_ERR_CNT_KEY + userName); + return success(); + } + + @InnerAuth + @PostMapping + public AjaxResult add(@RequestBody SysLogininfor logininfor) + { + return toAjax(logininforService.insertLogininfor(logininfor)); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysMenuController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysMenuController.java new file mode 100644 index 0000000..75cb764 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysMenuController.java @@ -0,0 +1,159 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.domain.SysMenu; +import com.zeroerr.system.service.ISysMenuService; + +/** + * 菜单信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/menu") +public class SysMenuController extends BaseController +{ + @Autowired + private ISysMenuService menuService; + + /** + * 获取菜单列表 + */ + @RequiresPermissions("system:menu:list") + @GetMapping("/list") + public AjaxResult list(SysMenu menu) + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuList(menu, userId); + return success(menus); + } + + /** + * 根据菜单编号获取详细信息 + */ + @RequiresPermissions("system:menu:query") + @GetMapping(value = "/{menuId}") + public AjaxResult getInfo(@PathVariable Long menuId) + { + return success(menuService.selectMenuById(menuId)); + } + + /** + * 获取菜单下拉树列表 + */ + @GetMapping("/treeselect") + public AjaxResult treeselect(SysMenu menu) + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuList(menu, userId); + return success(menuService.buildMenuTreeSelect(menus)); + } + + /** + * 加载对应角色菜单列表树 + */ + @GetMapping(value = "/roleMenuTreeselect/{roleId}") + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuList(userId); + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); + ajax.put("menus", menuService.buildMenuTreeSelect(menus)); + return ajax; + } + + /** + * 新增菜单 + */ + @RequiresPermissions("system:menu:add") + @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysMenu menu) + { + if (!menuService.checkMenuNameUnique(menu)) + { + return error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); + } + menu.setCreateBy(SecurityUtils.getUsername()); + return toAjax(menuService.insertMenu(menu)); + } + + /** + * 修改菜单 + */ + @RequiresPermissions("system:menu:edit") + @Log(title = "菜单管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysMenu menu) + { + if (!menuService.checkMenuNameUnique(menu)) + { + return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); + } + else if (menu.getMenuId().equals(menu.getParentId())) + { + return error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己"); + } + menu.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(menuService.updateMenu(menu)); + } + + /** + * 删除菜单 + */ + @RequiresPermissions("system:menu:remove") + @Log(title = "菜单管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{menuId}") + public AjaxResult remove(@PathVariable("menuId") Long menuId) + { + if (menuService.hasChildByMenuId(menuId)) + { + return warn("存在子菜单,不允许删除"); + } + if (menuService.checkMenuExistRole(menuId)) + { + return warn("菜单已分配,不允许删除"); + } + return toAjax(menuService.deleteMenuById(menuId)); + } + + /** + * 获取路由信息 + * + * @return 路由信息 + */ + @GetMapping("getRouters") + public AjaxResult getRouters() + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuTreeByUserId(userId); + return success(menuService.buildMenus(menus)); + } +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysNoticeController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysNoticeController.java new file mode 100644 index 0000000..46e5387 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysNoticeController.java @@ -0,0 +1,92 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.domain.SysNotice; +import com.zeroerr.system.service.ISysNoticeService; + +/** + * 公告 信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/notice") +public class SysNoticeController extends BaseController +{ + @Autowired + private ISysNoticeService noticeService; + + /** + * 获取通知公告列表 + */ + @RequiresPermissions("system:notice:list") + @GetMapping("/list") + public TableDataInfo list(SysNotice notice) + { + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + + /** + * 根据通知公告编号获取详细信息 + */ + @RequiresPermissions("system:notice:query") + @GetMapping(value = "/{noticeId}") + public AjaxResult getInfo(@PathVariable Long noticeId) + { + return success(noticeService.selectNoticeById(noticeId)); + } + + /** + * 新增通知公告 + */ + @RequiresPermissions("system:notice:add") + @Log(title = "通知公告", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysNotice notice) + { + notice.setCreateBy(SecurityUtils.getUsername()); + return toAjax(noticeService.insertNotice(notice)); + } + + /** + * 修改通知公告 + */ + @RequiresPermissions("system:notice:edit") + @Log(title = "通知公告", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysNotice notice) + { + notice.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(noticeService.updateNotice(notice)); + } + + /** + * 删除通知公告 + */ + @RequiresPermissions("system:notice:remove") + @Log(title = "通知公告", businessType = BusinessType.DELETE) + @DeleteMapping("/{noticeIds}") + public AjaxResult remove(@PathVariable Long[] noticeIds) + { + return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysOperlogController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysOperlogController.java new file mode 100644 index 0000000..38b4ae1 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysOperlogController.java @@ -0,0 +1,78 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.InnerAuth; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.system.api.domain.SysOperLog; +import com.zeroerr.system.service.ISysOperLogService; + +/** + * 操作日志记录 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/operlog") +public class SysOperlogController extends BaseController +{ + @Autowired + private ISysOperLogService operLogService; + + @RequiresPermissions("system:operlog:list") + @GetMapping("/list") + public TableDataInfo list(SysOperLog operLog) + { + startPage(); + List list = operLogService.selectOperLogList(operLog); + return getDataTable(list); + } + + @Log(title = "操作日志", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:operlog:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysOperLog operLog) + { + List list = operLogService.selectOperLogList(operLog); + ExcelUtil util = new ExcelUtil(SysOperLog.class); + util.exportExcel(response, list, "操作日志"); + } + + @Log(title = "操作日志", businessType = BusinessType.DELETE) + @RequiresPermissions("system:operlog:remove") + @DeleteMapping("/{operIds}") + public AjaxResult remove(@PathVariable Long[] operIds) + { + return toAjax(operLogService.deleteOperLogByIds(operIds)); + } + + @RequiresPermissions("system:operlog:remove") + @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + operLogService.cleanOperLog(); + return success(); + } + + @InnerAuth + @PostMapping + public AjaxResult add(@RequestBody SysOperLog operLog) + { + return toAjax(operLogService.insertOperlog(operLog)); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysPostController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysPostController.java new file mode 100644 index 0000000..ecdb2e3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysPostController.java @@ -0,0 +1,130 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.domain.SysPost; +import com.zeroerr.system.service.ISysPostService; + +/** + * 岗位信息操作处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/post") +public class SysPostController extends BaseController +{ + @Autowired + private ISysPostService postService; + + /** + * 获取岗位列表 + */ + @RequiresPermissions("system:post:list") + @GetMapping("/list") + public TableDataInfo list(SysPost post) + { + startPage(); + List list = postService.selectPostList(post); + return getDataTable(list); + } + + @Log(title = "岗位管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:post:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysPost post) + { + List list = postService.selectPostList(post); + ExcelUtil util = new ExcelUtil(SysPost.class); + util.exportExcel(response, list, "岗位数据"); + } + + /** + * 根据岗位编号获取详细信息 + */ + @RequiresPermissions("system:post:query") + @GetMapping(value = "/{postId}") + public AjaxResult getInfo(@PathVariable Long postId) + { + return success(postService.selectPostById(postId)); + } + + /** + * 新增岗位 + */ + @RequiresPermissions("system:post:add") + @Log(title = "岗位管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysPost post) + { + if (!postService.checkPostNameUnique(post)) + { + return error("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } + else if (!postService.checkPostCodeUnique(post)) + { + return error("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在"); + } + post.setCreateBy(SecurityUtils.getUsername()); + return toAjax(postService.insertPost(post)); + } + + /** + * 修改岗位 + */ + @RequiresPermissions("system:post:edit") + @Log(title = "岗位管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysPost post) + { + if (!postService.checkPostNameUnique(post)) + { + return error("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } + else if (!postService.checkPostCodeUnique(post)) + { + return error("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在"); + } + post.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(postService.updatePost(post)); + } + + /** + * 删除岗位 + */ + @RequiresPermissions("system:post:remove") + @Log(title = "岗位管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{postIds}") + public AjaxResult remove(@PathVariable Long[] postIds) + { + return toAjax(postService.deletePostByIds(postIds)); + } + + /** + * 获取岗位选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + List posts = postService.selectPostAll(); + return success(posts); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysProfileController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysProfileController.java new file mode 100644 index 0000000..969abf6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysProfileController.java @@ -0,0 +1,154 @@ +package com.zeroerr.system.controller; + +import java.util.Arrays; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.file.FileTypeUtils; +import com.zeroerr.common.core.utils.file.MimeTypeUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.service.TokenService; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.RemoteFileService; +import com.zeroerr.system.api.domain.SysFile; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.service.ISysUserService; + +/** + * 个人信息 业务处理 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/user/profile") +public class SysProfileController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private TokenService tokenService; + + @Autowired + private RemoteFileService remoteFileService; + + /** + * 个人信息 + */ + @GetMapping + public AjaxResult profile() + { + String username = SecurityUtils.getUsername(); + SysUser user = userService.selectUserByUserName(username); + AjaxResult ajax = AjaxResult.success(user); + ajax.put("roleGroup", userService.selectUserRoleGroup(username)); + ajax.put("postGroup", userService.selectUserPostGroup(username)); + return ajax; + } + + /** + * 修改用户 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult updateProfile(@RequestBody SysUser user) + { + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysUser currentUser = loginUser.getSysUser(); + currentUser.setNickName(user.getNickName()); + currentUser.setEmail(user.getEmail()); + currentUser.setPhonenumber(user.getPhonenumber()); + currentUser.setSex(user.getSex()); + if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser)) + { + return error("修改用户'" + loginUser.getUsername() + "'失败,手机号码已存在"); + } + if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser)) + { + return error("修改用户'" + loginUser.getUsername() + "'失败,邮箱账号已存在"); + } + if (userService.updateUserProfile(currentUser)) + { + // 更新缓存用户信息 + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改个人信息异常,请联系管理员"); + } + + /** + * 重置密码 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + public AjaxResult updatePwd(String oldPassword, String newPassword) + { + String username = SecurityUtils.getUsername(); + SysUser user = userService.selectUserByUserName(username); + String password = user.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return error("修改密码失败,旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return error("新密码不能与旧密码相同"); + } + newPassword = SecurityUtils.encryptPassword(newPassword); + if (userService.resetUserPwd(username, newPassword) > 0) + { + // 更新缓存用户密码 + LoginUser loginUser = SecurityUtils.getLoginUser(); + loginUser.getSysUser().setPassword(newPassword); + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改密码异常,请联系管理员"); + } + + /** + * 头像上传 + */ + @Log(title = "用户头像", businessType = BusinessType.UPDATE) + @PostMapping("/avatar") + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) + { + if (!file.isEmpty()) + { + LoginUser loginUser = SecurityUtils.getLoginUser(); + String extension = FileTypeUtils.getExtension(file); + if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) + { + return error("文件格式不正确,请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); + } + R fileResult = remoteFileService.upload(file); + if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) + { + return error("文件服务异常,请联系管理员"); + } + String url = fileResult.getData().getUrl(); + if (userService.updateUserAvatar(loginUser.getUsername(), url)) + { + AjaxResult ajax = AjaxResult.success(); + ajax.put("imgUrl", url); + // 更新缓存用户头像 + loginUser.getSysUser().setAvatar(url); + tokenService.setLoginUser(loginUser); + return ajax; + } + } + return error("上传图片异常,请联系管理员"); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysRoleController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysRoleController.java new file mode 100644 index 0000000..d4ca124 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysRoleController.java @@ -0,0 +1,239 @@ +package com.zeroerr.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.SysUserRole; +import com.zeroerr.system.service.ISysDeptService; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; + +/** + * 角色信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/role") +public class SysRoleController extends BaseController +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysUserService userService; + + @Autowired + private ISysDeptService deptService; + + @RequiresPermissions("system:role:list") + @GetMapping("/list") + public TableDataInfo list(SysRole role) + { + startPage(); + List list = roleService.selectRoleList(role); + return getDataTable(list); + } + + @Log(title = "角色管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:role:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysRole role) + { + List list = roleService.selectRoleList(role); + ExcelUtil util = new ExcelUtil(SysRole.class); + util.exportExcel(response, list, "角色数据"); + } + + /** + * 根据角色编号获取详细信息 + */ + @RequiresPermissions("system:role:query") + @GetMapping(value = "/{roleId}") + public AjaxResult getInfo(@PathVariable Long roleId) + { + roleService.checkRoleDataScope(roleId); + return success(roleService.selectRoleById(roleId)); + } + + /** + * 新增角色 + */ + @RequiresPermissions("system:role:add") + @Log(title = "角色管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysRole role) + { + if (!roleService.checkRoleNameUnique(role)) + { + return error("新增角色'" + role.getRoleName() + "'失败,角色名称已存在"); + } + else if (!roleService.checkRoleKeyUnique(role)) + { + return error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在"); + } + role.setCreateBy(SecurityUtils.getUsername()); + return toAjax(roleService.insertRole(role)); + + } + + /** + * 修改保存角色 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + if (!roleService.checkRoleNameUnique(role)) + { + return error("修改角色'" + role.getRoleName() + "'失败,角色名称已存在"); + } + else if (!roleService.checkRoleKeyUnique(role)) + { + return error("修改角色'" + role.getRoleName() + "'失败,角色权限已存在"); + } + role.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(roleService.updateRole(role)); + } + + /** + * 修改保存数据权限 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/dataScope") + public AjaxResult dataScope(@RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.authDataScope(role)); + } + + /** + * 状态修改 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + role.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(roleService.updateRoleStatus(role)); + } + + /** + * 删除角色 + */ + @RequiresPermissions("system:role:remove") + @Log(title = "角色管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{roleIds}") + public AjaxResult remove(@PathVariable Long[] roleIds) + { + return toAjax(roleService.deleteRoleByIds(roleIds)); + } + + /** + * 获取角色选择框列表 + */ + @RequiresPermissions("system:role:query") + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + return success(roleService.selectRoleAll()); + } + /** + * 查询已分配用户角色列表 + */ + @RequiresPermissions("system:role:list") + @GetMapping("/authUser/allocatedList") + public TableDataInfo allocatedList(SysUser user) + { + startPage(); + List list = userService.selectAllocatedList(user); + return getDataTable(list); + } + + /** + * 查询未分配用户角色列表 + */ + @RequiresPermissions("system:role:list") + @GetMapping("/authUser/unallocatedList") + public TableDataInfo unallocatedList(SysUser user) + { + startPage(); + List list = userService.selectUnallocatedList(user); + return getDataTable(list); + } + + /** + * 取消授权用户 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancel") + public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) + { + return toAjax(roleService.deleteAuthUser(userRole)); + } + + /** + * 批量取消授权用户 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancelAll") + public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) + { + return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + } + + /** + * 批量选择用户授权 + */ + @RequiresPermissions("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/selectAll") + public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) + { + roleService.checkRoleDataScope(roleId); + return toAjax(roleService.insertAuthUsers(roleId, userIds)); + } + + /** + * 获取对应角色部门树列表 + */ + @RequiresPermissions("system:role:query") + @GetMapping(value = "/deptTree/{roleId}") + public AjaxResult deptTree(@PathVariable("roleId") Long roleId) + { + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); + ajax.put("depts", deptService.selectDeptTreeList(new SysDept())); + return ajax; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserController.java new file mode 100644 index 0000000..5123d8f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserController.java @@ -0,0 +1,341 @@ +package com.zeroerr.system.controller; + +import java.io.IOException; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.zeroerr.common.core.domain.R; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.poi.ExcelUtil; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.security.annotation.InnerAuth; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.service.ISysConfigService; +import com.zeroerr.system.service.ISysDeptService; +import com.zeroerr.system.service.ISysPermissionService; +import com.zeroerr.system.service.ISysPostService; +import com.zeroerr.system.service.ISysRoleService; +import com.zeroerr.system.service.ISysUserService; + +/** + * 用户信息 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/user") +public class SysUserController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysDeptService deptService; + + @Autowired + private ISysPostService postService; + + @Autowired + private ISysPermissionService permissionService; + + @Autowired + private ISysConfigService configService; + + /** + * 获取用户列表 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/list") + public TableDataInfo list(SysUser user) + { + startPage(); + List list = userService.selectUserList(user); + return getDataTable(list); + } + + @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @RequiresPermissions("system:user:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysUser user) + { + List list = userService.selectUserList(user); + ExcelUtil util = new ExcelUtil(SysUser.class); + util.exportExcel(response, list, "用户数据"); + } + + @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @RequiresPermissions("system:user:import") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil util = new ExcelUtil(SysUser.class); + List userList = util.importExcel(file.getInputStream()); + String operName = SecurityUtils.getUsername(); + String message = userService.importUser(userList, updateSupport, operName); + return success(message); + } + + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) throws IOException + { + ExcelUtil util = new ExcelUtil(SysUser.class); + util.importTemplateExcel(response, "用户数据"); + } + + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/info/{username}") + public R info(@PathVariable("username") String username) + { + SysUser sysUser = userService.selectUserByUserName(username); + if (StringUtils.isNull(sysUser)) + { + return R.fail("用户名或密码错误"); + } + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + // 权限集合 + Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + return R.ok(sysUserVo); + } + + /** + * 注册用户信息 + */ + @InnerAuth + @PostMapping("/register") + public R register(@RequestBody SysUser sysUser) + { + String username = sysUser.getUserName(); + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + { + return R.fail("当前系统没有开启注册功能!"); + } + if (!userService.checkUserNameUnique(sysUser)) + { + return R.fail("保存用户'" + username + "'失败,注册账号已存在"); + } + return R.ok(userService.registerUser(sysUser)); + } + + /** + *记录用户登录IP地址和登录时间 + */ + @InnerAuth + @PutMapping("/recordlogin") + public R recordlogin(@RequestBody SysUser sysUser) + { + return R.ok(userService.updateUserProfile(sysUser)); + } + + /** + * 获取用户信息 + * + * @return 用户信息 + */ + @GetMapping("getInfo") + public AjaxResult getInfo() + { + SysUser user = userService.selectUserById(SecurityUtils.getUserId()); + // 角色集合 + Set roles = permissionService.getRolePermission(user); + // 权限集合 + Set permissions = permissionService.getMenuPermission(user); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user", user); + ajax.put("roles", roles); + ajax.put("permissions", permissions); + return ajax; + } + + /** + * 根据用户编号获取详细信息 + */ + @RequiresPermissions("system:user:query") + @GetMapping(value = { "/", "/{userId}" }) + public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) + { + userService.checkUserDataScope(userId); + AjaxResult ajax = AjaxResult.success(); + List roles = roleService.selectRoleAll(); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + ajax.put("posts", postService.selectPostAll()); + if (StringUtils.isNotNull(userId)) + { + SysUser sysUser = userService.selectUserById(userId); + ajax.put(AjaxResult.DATA_TAG, sysUser); + ajax.put("postIds", postService.selectPostListByUserId(userId)); + ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + } + return ajax; + } + + /** + * 新增用户 + */ + @RequiresPermissions("system:user:add") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysUser user) + { + deptService.checkDeptDataScope(user.getDeptId()); + roleService.checkRoleDataScope(user.getRoleIds()); + if (!userService.checkUserNameUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在"); + } + user.setCreateBy(SecurityUtils.getUsername()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + return toAjax(userService.insertUser(user)); + } + + /** + * 修改用户 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); + roleService.checkRoleDataScope(user.getRoleIds()); + if (!userService.checkUserNameUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); + } + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.updateUser(user)); + } + + /** + * 删除用户 + */ + @RequiresPermissions("system:user:remove") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public AjaxResult remove(@PathVariable Long[] userIds) + { + if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) + { + return error("当前用户不能删除"); + } + return toAjax(userService.deleteUserByIds(userIds)); + } + + /** + * 重置密码 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/resetPwd") + public AjaxResult resetPwd(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.resetPwd(user)); + } + + /** + * 状态修改 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(userService.updateUserStatus(user)); + } + + /** + * 根据用户编号获取授权角色 + */ + @RequiresPermissions("system:user:query") + @GetMapping("/authRole/{userId}") + public AjaxResult authRole(@PathVariable("userId") Long userId) + { + AjaxResult ajax = AjaxResult.success(); + SysUser user = userService.selectUserById(userId); + List roles = roleService.selectRolesByUserId(userId); + ajax.put("user", user); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + return ajax; + } + + /** + * 用户授权角色 + */ + @RequiresPermissions("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.GRANT) + @PutMapping("/authRole") + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) + { + userService.checkUserDataScope(userId); + roleService.checkRoleDataScope(roleIds); + userService.insertUserAuth(userId, roleIds); + return success(); + } + + /** + * 获取部门树列表 + */ + @RequiresPermissions("system:user:list") + @GetMapping("/deptTree") + public AjaxResult deptTree(SysDept dept) + { + return success(deptService.selectDeptTreeList(dept)); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserOnlineController.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserOnlineController.java new file mode 100644 index 0000000..ad67d62 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/controller/SysUserOnlineController.java @@ -0,0 +1,83 @@ +package com.zeroerr.system.controller; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.web.controller.BaseController; +import com.zeroerr.common.core.web.domain.AjaxResult; +import com.zeroerr.common.core.web.page.TableDataInfo; +import com.zeroerr.common.log.annotation.Log; +import com.zeroerr.common.log.enums.BusinessType; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.common.security.annotation.RequiresPermissions; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.domain.SysUserOnline; +import com.zeroerr.system.service.ISysUserOnlineService; + +/** + * 在线用户监控 + * + * @author ruoyi + */ +@RestController +@RequestMapping("/online") +public class SysUserOnlineController extends BaseController +{ + @Autowired + private ISysUserOnlineService userOnlineService; + + @Autowired + private RedisService redisService; + + @RequiresPermissions("monitor:online:list") + @GetMapping("/list") + public TableDataInfo list(String ipaddr, String userName) + { + Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); + List userOnlineList = new ArrayList(); + for (String key : keys) + { + LoginUser user = redisService.getCacheObject(key); + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) + { + userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); + } + else if (StringUtils.isNotEmpty(ipaddr)) + { + userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); + } + else if (StringUtils.isNotEmpty(userName)) + { + userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); + } + else + { + userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); + } + } + Collections.reverse(userOnlineList); + userOnlineList.removeAll(Collections.singleton(null)); + return getDataTable(userOnlineList); + } + + /** + * 强退用户 + */ + @RequiresPermissions("monitor:online:forceLogout") + @Log(title = "在线用户", businessType = BusinessType.FORCE) + @DeleteMapping("/{tokenId}") + public AjaxResult forceLogout(@PathVariable String tokenId) + { + redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); + return success(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysConfig.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysConfig.java new file mode 100644 index 0000000..b14967b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysConfig.java @@ -0,0 +1,111 @@ +package com.zeroerr.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 参数配置表 sys_config + * + * @author ruoyi + */ +public class SysConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) + private Long configId; + + /** 参数名称 */ + @Excel(name = "参数名称") + private String configName; + + /** 参数键名 */ + @Excel(name = "参数键名") + private String configKey; + + /** 参数键值 */ + @Excel(name = "参数键值") + private String configValue; + + /** 系统内置(Y是 N否) */ + @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") + private String configType; + + public Long getConfigId() + { + return configId; + } + + public void setConfigId(Long configId) + { + this.configId = configId; + } + + @NotBlank(message = "参数名称不能为空") + @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + @NotBlank(message = "参数键名长度不能为空") + @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") + public String getConfigKey() + { + return configKey; + } + + public void setConfigKey(String configKey) + { + this.configKey = configKey; + } + + @NotBlank(message = "参数键值不能为空") + @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") + public String getConfigValue() + { + return configValue; + } + + public void setConfigValue(String configValue) + { + this.configValue = configValue; + } + + public String getConfigType() + { + return configType; + } + + public void setConfigType(String configType) + { + this.configType = configType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysMenu.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysMenu.java new file mode 100644 index 0000000..cedb80a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysMenu.java @@ -0,0 +1,274 @@ +package com.zeroerr.system.domain; + +import java.util.ArrayList; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 菜单权限表 sys_menu + * + * @author ruoyi + */ +public class SysMenu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单ID */ + private Long menuId; + + /** 菜单名称 */ + private String menuName; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 路由地址 */ + private String path; + + /** 组件路径 */ + private String component; + + /** 路由参数 */ + private String query; + + /** 路由名称,默认和路由地址相同的驼峰格式(注意:因为vue3版本的router会删除名称相同路由,为避免名字的冲突,特殊情况可以自定义) */ + private String routeName; + + /** 是否为外链(0是 1否) */ + private String isFrame; + + /** 是否缓存(0缓存 1不缓存) */ + private String isCache; + + /** 类型(M目录 C菜单 F按钮) */ + private String menuType; + + /** 显示状态(0显示 1隐藏) */ + private String visible; + + /** 菜单状态(0正常 1停用) */ + private String status; + + /** 权限字符串 */ + private String perms; + + /** 菜单图标 */ + private String icon; + + /** 子菜单 */ + private List children = new ArrayList(); + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @NotBlank(message = "菜单名称不能为空") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") + public String getMenuName() + { + return menuName; + } + + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") + public String getPath() + { + return path; + } + + public void setPath(String path) + { + this.path = path; + } + + @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") + public String getComponent() + { + return component; + } + + public void setComponent(String component) + { + this.component = component; + } + + public String getQuery() + { + return query; + } + + public void setQuery(String query) + { + this.query = query; + } + + public String getRouteName() + { + return routeName; + } + + public void setRouteName(String routeName) + { + this.routeName = routeName; + } + + public String getIsFrame() + { + return isFrame; + } + + public void setIsFrame(String isFrame) + { + this.isFrame = isFrame; + } + + public String getIsCache() + { + return isCache; + } + + public void setIsCache(String isCache) + { + this.isCache = isCache; + } + + @NotBlank(message = "菜单类型不能为空") + public String getMenuType() + { + return menuType; + } + + public void setMenuType(String menuType) + { + this.menuType = menuType; + } + + public String getVisible() + { + return visible; + } + + public void setVisible(String visible) + { + this.visible = visible; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") + public String getPerms() + { + return perms; + } + + public void setPerms(String perms) + { + this.perms = perms; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("path", getPath()) + .append("component", getComponent()) + .append("query", getQuery()) + .append("routeName", getRouteName()) + .append("isFrame", getIsFrame()) + .append("IsCache", getIsCache()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("status ", getStatus()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysNotice.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysNotice.java new file mode 100644 index 0000000..aecdd9a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysNotice.java @@ -0,0 +1,102 @@ +package com.zeroerr.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.web.domain.BaseEntity; +import com.zeroerr.common.core.xss.Xss; + +/** + * 通知公告表 sys_notice + * + * @author ruoyi + */ +public class SysNotice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 公告ID */ + private Long noticeId; + + /** 公告标题 */ + private String noticeTitle; + + /** 公告类型(1通知 2公告) */ + private String noticeType; + + /** 公告内容 */ + private String noticeContent; + + /** 公告状态(0正常 1关闭) */ + private String status; + + public Long getNoticeId() + { + return noticeId; + } + + public void setNoticeId(Long noticeId) + { + this.noticeId = noticeId; + } + + public void setNoticeTitle(String noticeTitle) + { + this.noticeTitle = noticeTitle; + } + + @Xss(message = "公告标题不能包含脚本字符") + @NotBlank(message = "公告标题不能为空") + @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") + public String getNoticeTitle() + { + return noticeTitle; + } + + public void setNoticeType(String noticeType) + { + this.noticeType = noticeType; + } + + public String getNoticeType() + { + return noticeType; + } + + public void setNoticeContent(String noticeContent) + { + this.noticeContent = noticeContent; + } + + public String getNoticeContent() + { + return noticeContent; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("noticeId", getNoticeId()) + .append("noticeTitle", getNoticeTitle()) + .append("noticeType", getNoticeType()) + .append("noticeContent", getNoticeContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysPost.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysPost.java new file mode 100644 index 0000000..4e58683 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysPost.java @@ -0,0 +1,124 @@ +package com.zeroerr.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.zeroerr.common.core.annotation.Excel; +import com.zeroerr.common.core.annotation.Excel.ColumnType; +import com.zeroerr.common.core.web.domain.BaseEntity; + +/** + * 岗位表 sys_post + * + * @author ruoyi + */ +public class SysPost extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 岗位序号 */ + @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) + private Long postId; + + /** 岗位编码 */ + @Excel(name = "岗位编码") + private String postCode; + + /** 岗位名称 */ + @Excel(name = "岗位名称") + private String postName; + + /** 岗位排序 */ + @Excel(name = "岗位排序") + private Integer postSort; + + /** 状态(0正常 1停用) */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 用户是否存在此岗位标识 默认不存在 */ + private boolean flag = false; + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + @NotBlank(message = "岗位编码不能为空") + @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") + public String getPostCode() + { + return postCode; + } + + public void setPostCode(String postCode) + { + this.postCode = postCode; + } + + @NotBlank(message = "岗位名称不能为空") + @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") + public String getPostName() + { + return postName; + } + + public void setPostName(String postName) + { + this.postName = postName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getPostSort() + { + return postSort; + } + + public void setPostSort(Integer postSort) + { + this.postSort = postSort; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postCode", getPostCode()) + .append("postName", getPostName()) + .append("postSort", getPostSort()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleDept.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleDept.java new file mode 100644 index 0000000..2fa9f82 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleDept.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和部门关联 sys_role_dept + * + * @author ruoyi + */ +public class SysRoleDept +{ + /** 角色ID */ + private Long roleId; + + /** 部门ID */ + private Long deptId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("deptId", getDeptId()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleMenu.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleMenu.java new file mode 100644 index 0000000..0cd39b7 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysRoleMenu.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和菜单关联 sys_role_menu + * + * @author ruoyi + */ +public class SysRoleMenu +{ + /** 角色ID */ + private Long roleId; + + /** 菜单ID */ + private Long menuId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("menuId", getMenuId()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserOnline.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserOnline.java new file mode 100644 index 0000000..c115980 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserOnline.java @@ -0,0 +1,100 @@ +package com.zeroerr.system.domain; + +/** + * 当前在线会话 + * + * @author ruoyi + */ +public class SysUserOnline +{ + /** 会话编号 */ + private String tokenId; + + /** 用户名称 */ + private String userName; + + /** 登录IP地址 */ + private String ipaddr; + + /** 登录地址 */ + private String loginLocation; + + /** 浏览器类型 */ + private String browser; + + /** 操作系统 */ + private String os; + + /** 登录时间 */ + private Long loginTime; + + public String getTokenId() + { + return tokenId; + } + + public void setTokenId(String tokenId) + { + this.tokenId = tokenId; + } + + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public Long getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Long loginTime) + { + this.loginTime = loginTime; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserPost.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserPost.java new file mode 100644 index 0000000..cb9dfce --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserPost.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和岗位关联 sys_user_post + * + * @author ruoyi + */ +public class SysUserPost +{ + /** 用户ID */ + private Long userId; + + /** 岗位ID */ + private Long postId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("postId", getPostId()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserRole.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserRole.java new file mode 100644 index 0000000..4c9f9f3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/SysUserRole.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和角色关联 sys_user_role + * + * @author ruoyi + */ +public class SysUserRole +{ + /** 用户ID */ + private Long userId; + + /** 角色ID */ + private Long roleId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/MetaVo.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/MetaVo.java new file mode 100644 index 0000000..5df1e9c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/MetaVo.java @@ -0,0 +1,106 @@ +package com.zeroerr.system.domain.vo; + +import com.zeroerr.common.core.utils.StringUtils; + +/** + * 路由显示信息 + * + * @author ruoyi + */ +public class MetaVo +{ + /** + * 设置该路由在侧边栏和面包屑中展示的名字 + */ + private String title; + + /** + * 设置该路由的图标,对应路径src/assets/icons/svg + */ + private String icon; + + /** + * 设置为true,则不会被 缓存 + */ + private boolean noCache; + + /** + * 内链地址(http(s)://开头) + */ + private String link; + + public MetaVo() + { + } + + public MetaVo(String title, String icon) + { + this.title = title; + this.icon = icon; + } + + public MetaVo(String title, String icon, boolean noCache) + { + this.title = title; + this.icon = icon; + this.noCache = noCache; + } + + public MetaVo(String title, String icon, String link) + { + this.title = title; + this.icon = icon; + this.link = link; + } + + public MetaVo(String title, String icon, boolean noCache, String link) + { + this.title = title; + this.icon = icon; + this.noCache = noCache; + if (StringUtils.ishttp(link)) + { + this.link = link; + } + } + + public boolean isNoCache() + { + return noCache; + } + + public void setNoCache(boolean noCache) + { + this.noCache = noCache; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public String getLink() + { + return link; + } + + public void setLink(String link) + { + this.link = link; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/RouterVo.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/RouterVo.java new file mode 100644 index 0000000..473c8ce --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/RouterVo.java @@ -0,0 +1,148 @@ +package com.zeroerr.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; + +/** + * 路由配置信息 + * + * @author ruoyi + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class RouterVo +{ + /** + * 路由名字 + */ + private String name; + + /** + * 路由地址 + */ + private String path; + + /** + * 是否隐藏路由,当设置 true 的时候该路由不会再侧边栏出现 + */ + private boolean hidden; + + /** + * 重定向地址,当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + */ + private String redirect; + + /** + * 组件地址 + */ + private String component; + + /** + * 路由参数:如 {"id": 1, "name": "ry"} + */ + private String query; + + /** + * 当你一个路由下面的 children 声明的路由大于1个时,自动会变成嵌套的模式--如组件页面 + */ + private Boolean alwaysShow; + + /** + * 其他元素 + */ + private MetaVo meta; + + /** + * 子路由 + */ + private List children; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getPath() + { + return path; + } + + public void setPath(String path) + { + this.path = path; + } + + public boolean getHidden() + { + return hidden; + } + + public void setHidden(boolean hidden) + { + this.hidden = hidden; + } + + public String getRedirect() + { + return redirect; + } + + public void setRedirect(String redirect) + { + this.redirect = redirect; + } + + public String getComponent() + { + return component; + } + + public void setComponent(String component) + { + this.component = component; + } + + public String getQuery() + { + return query; + } + + public void setQuery(String query) + { + this.query = query; + } + + public Boolean getAlwaysShow() + { + return alwaysShow; + } + + public void setAlwaysShow(Boolean alwaysShow) + { + this.alwaysShow = alwaysShow; + } + + public MetaVo getMeta() + { + return meta; + } + + public void setMeta(MetaVo meta) + { + this.meta = meta; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/TreeSelect.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/TreeSelect.java new file mode 100644 index 0000000..6dadb64 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/domain/vo/TreeSelect.java @@ -0,0 +1,83 @@ +package com.zeroerr.system.domain.vo; + +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.domain.SysMenu; + +/** + * Treeselect树结构实体类 + * + * @author ruoyi + */ +public class TreeSelect implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 节点ID */ + private Long id; + + /** 节点名称 */ + private String label; + + /** 子节点 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + + public TreeSelect() + { + + } + + public TreeSelect(SysDept dept) + { + this.id = dept.getDeptId(); + this.label = dept.getDeptName(); + this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + public TreeSelect(RecruitStructure node) + { + this.id = node.getNodeId(); + this.label = node.getNodeName(); + this.children = node.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + public TreeSelect(SysMenu menu) + { + this.id = menu.getMenuId(); + this.label = menu.getMenuName(); + this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/RecruitStructureMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/RecruitStructureMapper.java new file mode 100644 index 0000000..90513ea --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/RecruitStructureMapper.java @@ -0,0 +1,65 @@ +package com.zeroerr.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zeroerr.system.api.domain.RecruitStructure; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + + +@Repository +public interface RecruitStructureMapper extends BaseMapper { + + + RecruitStructure checkNodeNameUnique(@Param("nodeName") String nodeName, @Param("parentId") Long parentId); + + RecruitStructure selectNodeById(@Param("parentId") Long parentId); + + Long insertNode(RecruitStructure node); + + List selectNodeList(RecruitStructure node); + + int selectNormalChildrenNodeById(Long nodeId); + + List selectChildrenNodeById(Long nodeId); + + int updateNodeChildren(@Param("nodes")List children); + + int updateNode(RecruitStructure node); + + void updateNodeStatusNormal(Long[] nodeIds); + + int hasChildByNodeId(Long nodeId); + + //int checkNodeExistUser(Long nodeId); + + int deleteNodeById(Long nodeId); + + List listSecond(); + + List listStructureList(); + + + void updatePostType(@Param("structurePostId") Long structurePostId,@Param("i") int i,@Param("taskId") String taskId); + + void updateByTaskId(@Param("taskId") String taskId); + + RecruitStructure getByNodeId(@Param("nodeId") Long nodeId); + + List selectDeptList(RecruitStructure recruitStructure); + + List selectPostAll(); + + List selectPostListByUserId(Long userId); + + List getList(String username); + + RecruitStructure getDeptByNodeId(Long nodeId); + + List filterByPostIdList(@Param("uniquePostIdList") List uniquePostIdList); + + String findTopLevelDepartmentNameByNodeId(Long postId); + + List getNodeList(@Param("nodeIds")List nodeIds); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysConfigMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..db38717 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysConfigMapper.java @@ -0,0 +1,78 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysConfig; +import org.springframework.stereotype.Repository; + +/** + * 参数配置 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysConfigMapper +{ + /** + * 查询参数配置信息 + * + * @param config 参数配置信息 + * @return 参数配置信息 + */ + public SysConfig selectConfig(SysConfig config); + + /** + * 通过ID查询配置 + * + * @param configId 参数ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数配置信息 + */ + public SysConfig checkConfigKeyUnique(String configKey); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 删除参数配置 + * + * @param configId 参数ID + * @return 结果 + */ + public int deleteConfigById(Long configId); + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + * @return 结果 + */ + public int deleteConfigByIds(Long[] configIds); +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDeptMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDeptMapper.java new file mode 100644 index 0000000..8457f89 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDeptMapper.java @@ -0,0 +1,120 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.zeroerr.system.api.domain.SysDept; +import org.springframework.stereotype.Repository; + +/** + * 部门管理 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysDeptMapper +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @param deptCheckStrictly 部门树选择项是否关联显示 + * @return 选中部门列表 + */ + public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 根据ID查询所有子部门 + * + * @param deptId 部门ID + * @return 部门列表 + */ + public List selectChildrenDeptById(Long deptId); + + /** + * 根据ID查询所有子部门(正常状态) + * + * @param deptId 部门ID + * @return 子部门数 + */ + public int selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + public int hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 + */ + public int checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param deptName 部门名称 + * @param parentId 父部门ID + * @return 结果 + */ + public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + + /** + * 新增部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 修改所在部门正常状态 + * + * @param deptIds 部门ID组 + */ + public void updateDeptStatusNormal(Long[] deptIds); + + /** + * 修改子元素关系 + * + * @param depts 子元素 + * @return 结果 + */ + public int updateDeptChildren(@Param("depts") List depts); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictDataMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictDataMapper.java new file mode 100644 index 0000000..20f1fa2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictDataMapper.java @@ -0,0 +1,99 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.zeroerr.system.api.domain.SysDictData; +import org.springframework.stereotype.Repository; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysDictDataMapper +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据 + */ + public int countDictDataByType(String dictType); + + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + public int deleteDictDataById(Long dictCode); + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + * @return 结果 + */ + public int deleteDictDataByIds(Long[] dictCodes); + + /** + * 新增字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); + + /** + * 同步修改字典类型 + * + * @param oldDictType 旧字典类型 + * @param newDictType 新旧字典类型 + * @return 结果 + */ + public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); + + SysDictData selectByChannel(@Param("channel") String channel, @Param("recruitProcessChannel") String recruitProcessChannel); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictTypeMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..3986ebb --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,85 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.api.domain.SysDictType; +import org.springframework.stereotype.Repository; + +/** + * 字典表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysDictTypeMapper +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + public SysDictType selectDictTypeByType(String dictType); + + /** + * 通过字典ID删除字典信息 + * + * @param dictId 字典ID + * @return 结果 + */ + public int deleteDictTypeById(Long dictId); + + /** + * 批量删除字典类型信息 + * + * @param dictIds 需要删除的字典ID + * @return 结果 + */ + public int deleteDictTypeByIds(Long[] dictIds); + + /** + * 新增字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public SysDictType checkDictTypeUnique(String dictType); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysLogininforMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..4a920aa --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysLogininforMapper.java @@ -0,0 +1,44 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.api.domain.SysLogininfor; +import org.springframework.stereotype.Repository; + +/** + * 系统访问日志情况信息 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysLogininforMapper +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public int insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + public int deleteLogininforByIds(Long[] infoIds); + + /** + * 清空系统登录日志 + * + * @return 结果 + */ + public int cleanLogininfor(); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysMenuMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysMenuMapper.java new file mode 100644 index 0000000..c19d8dc --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysMenuMapper.java @@ -0,0 +1,127 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.zeroerr.system.domain.SysMenu; +import org.springframework.stereotype.Repository; + +/** + * 菜单表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysMenuMapper +{ + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu); + + /** + * 根据用户所有权限 + * + * @return 权限列表 + */ + public List selectMenuPerms(); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuListByUserId(SysMenu menu); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public List selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public List selectMenuPermsByUserId(Long userId); + + /** + * 根据用户ID查询菜单 + * + * @return 菜单列表 + */ + public List selectMenuTreeAll(); + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @param menuCheckStrictly 菜单树选择项是否关联显示 + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int hasChildByMenuId(Long menuId); + + /** + * 新增菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menuName 菜单名称 + * @param parentId 父菜单ID + * @return 结果 + */ + public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysNoticeMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..b6a42ef --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysNoticeMapper.java @@ -0,0 +1,62 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysNotice; +import org.springframework.stereotype.Repository; + +/** + * 通知公告表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysNoticeMapper +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 批量删除公告 + * + * @param noticeId 公告ID + * @return 结果 + */ + public int deleteNoticeById(Long noticeId); + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + public int deleteNoticeByIds(Long[] noticeIds); +} \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysOperLogMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..91176cd --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysOperLogMapper.java @@ -0,0 +1,50 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.api.domain.SysOperLog; +import org.springframework.stereotype.Repository; + +/** + * 操作日志 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysOperLogMapper +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public int insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + public int deleteOperLogByIds(Long[] operIds); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysPostMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysPostMapper.java new file mode 100644 index 0000000..cb818d6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysPostMapper.java @@ -0,0 +1,101 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysPost; +import org.springframework.stereotype.Repository; + +/** + * 岗位信息 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysPostMapper +{ + /** + * 查询岗位数据集合 + * + * @param post 岗位信息 + * @return 岗位数据集合 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + public List selectPostListByUserId(Long userId); + + /** + * 查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + public List selectPostsByUserName(String userName); + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + public int deletePostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + public int deletePostByIds(Long[] postIds); + + /** + * 修改岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); + + /** + * 新增岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 校验岗位名称 + * + * @param postName 岗位名称 + * @return 结果 + */ + public SysPost checkPostNameUnique(String postName); + + /** + * 校验岗位编码 + * + * @param postCode 岗位编码 + * @return 结果 + */ + public SysPost checkPostCodeUnique(String postCode); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleDeptMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleDeptMapper.java new file mode 100644 index 0000000..eb99d11 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleDeptMapper.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysRoleDept; +import org.springframework.stereotype.Repository; + +/** + * 角色与部门关联表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysRoleDeptMapper +{ + /** + * 通过角色ID删除角色和部门关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleDeptByRoleId(Long roleId); + + /** + * 批量删除角色部门关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleDept(Long[] ids); + + /** + * 查询部门使用数量 + * + * @param deptId 部门ID + * @return 结果 + */ + public int selectCountRoleDeptByDeptId(Long deptId); + + /** + * 批量新增角色部门信息 + * + * @param roleDeptList 角色部门列表 + * @return 结果 + */ + public int batchRoleDept(List roleDeptList); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMapper.java new file mode 100644 index 0000000..287ed26 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMapper.java @@ -0,0 +1,115 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.api.domain.SysRole; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + * 角色表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysRoleMapper +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 根据用户ID查询角色 + * + * @param userName 用户名 + * @return 角色列表 + */ + public List selectRolesByUserName(String userName); + + /** + * 校验角色名称是否唯一 + * + * @param roleName 角色名称 + * @return 角色信息 + */ + public SysRole checkRoleNameUnique(String roleName); + + /** + * 校验角色权限是否唯一 + * + * @param roleKey 角色权限 + * @return 角色信息 + */ + public SysRole checkRoleKeyUnique(String roleKey); + + /** + * 修改角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 新增角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds); + + + SysRole getBoss(); + + List rolesByUserId(@Param("userId") Long userId); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMenuMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMenuMapper.java new file mode 100644 index 0000000..e5fb88b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysRoleMenuMapper.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysRoleMenu; +import org.springframework.stereotype.Repository; + +/** + * 角色与菜单关联表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysRoleMenuMapper +{ + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int checkMenuExistRole(Long menuId); + + /** + * 通过角色ID删除角色和菜单关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleMenuByRoleId(Long roleId); + + /** + * 批量删除角色菜单关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleMenu(Long[] ids); + + /** + * 批量新增角色菜单信息 + * + * @param roleMenuList 角色菜单列表 + * @return 结果 + */ + public int batchRoleMenu(List roleMenuList); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserMapper.java new file mode 100644 index 0000000..13db89b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserMapper.java @@ -0,0 +1,139 @@ +package com.zeroerr.system.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.zeroerr.system.api.domain.SysUser; +import org.springframework.stereotype.Repository; + +/** + * 用户表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysUserMapper +{ + /** + * 根据条件分页查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser sysUser); + + /** + * 根据条件分页查询已配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 校验用户名称是否唯一 + * + * @param userName 用户名称 + * @return 结果 + */ + public SysUser checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); + + SysUser getUser(Long roleId); + + SysUser selectCEORole(); + + List selectHrList(); + + List selectAllUserList(); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserPostMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserPostMapper.java new file mode 100644 index 0000000..26e6337 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserPostMapper.java @@ -0,0 +1,46 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import com.zeroerr.system.domain.SysUserPost; +import org.springframework.stereotype.Repository; + +/** + * 用户与岗位关联表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysUserPostMapper +{ + /** + * 通过用户ID删除用户和岗位关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserPostByUserId(Long userId); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 批量删除用户和岗位关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserPost(Long[] ids); + + /** + * 批量新增用户岗位信息 + * + * @param userPostList 用户岗位列表 + * @return 结果 + */ + public int batchUserPost(List userPostList); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserRoleMapper.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..1ea60e2 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/mapper/SysUserRoleMapper.java @@ -0,0 +1,64 @@ +package com.zeroerr.system.mapper; + +import java.util.List; +import org.apache.ibatis.annotations.Param; +import com.zeroerr.system.domain.SysUserRole; +import org.springframework.stereotype.Repository; + +/** + * 用户与角色关联表 数据层 + * + * @author ruoyi + */ +@Repository +public interface SysUserRoleMapper +{ + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserRoleByUserId(Long userId); + + /** + * 批量删除用户和角色关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserRole(Long[] ids); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 批量新增用户角色信息 + * + * @param userRoleList 用户角色列表 + * @return 结果 + */ + public int batchUserRole(List userRoleList); + + /** + * 删除用户和角色关联信息 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteUserRoleInfo(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysConfigService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysConfigService.java new file mode 100644 index 0000000..91627b4 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysConfigService.java @@ -0,0 +1,83 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.domain.SysConfig; +import org.springframework.stereotype.Service; + +/** + * 参数配置 服务层 + * + * @author ruoyi + */ +public interface ISysConfigService +{ + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数键值 + */ + public String selectConfigByKey(String configKey); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + public void deleteConfigByIds(Long[] configIds); + + /** + * 加载参数缓存数据 + */ + public void loadingConfigCache(); + + /** + * 清空参数缓存数据 + */ + public void clearConfigCache(); + + /** + * 重置参数缓存数据 + */ + public void resetConfigCache(); + + /** + * 校验参数键名是否唯一 + * + * @param config 参数信息 + * @return 结果 + */ + public boolean checkConfigKeyUnique(SysConfig config); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDeptService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDeptService.java new file mode 100644 index 0000000..735d927 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDeptService.java @@ -0,0 +1,125 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.domain.vo.TreeSelect; +import org.springframework.stereotype.Service; + +/** + * 部门管理 服务层 + * + * @author ruoyi + */ +public interface ISysDeptService +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 查询部门树结构信息 + * + * @param dept 部门信息 + * @return 部门树信息集合 + */ + public List selectDeptTreeList(SysDept dept); + + /** + * 构建前端所需要树结构 + * + * @param depts 部门列表 + * @return 树结构列表 + */ + public List buildDeptTree(List depts); + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + public List buildDeptTreeSelect(List depts); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + public List selectDeptListByRoleId(Long roleId); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 根据ID查询所有子部门(正常状态) + * + * @param deptId 部门ID + * @return 子部门数 + */ + public int selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在部门子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + public boolean hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + public boolean checkDeptNameUnique(SysDept dept); + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + public void checkDeptDataScope(Long deptId); + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictDataService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictDataService.java new file mode 100644 index 0000000..206c76b --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictDataService.java @@ -0,0 +1,63 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysDictData; +import org.springframework.stereotype.Service; + +/** + * 字典 业务层 + * + * @author ruoyi + */ +public interface ISysDictDataService +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(String dictType, String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + public void deleteDictDataByIds(Long[] dictCodes); + + /** + * 新增保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); + + SysDictData selectByChannel(String channel, String recruit_process_channel); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictTypeService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictTypeService.java new file mode 100644 index 0000000..4bda9ad --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysDictTypeService.java @@ -0,0 +1,99 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysDictData; +import com.zeroerr.system.api.domain.SysDictType; +import org.springframework.stereotype.Service; + +/** + * 字典 业务层 + * + * @author ruoyi + */ +public interface ISysDictTypeService +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + public SysDictType selectDictTypeByType(String dictType); + + /** + * 批量删除字典信息 + * + * @param dictIds 需要删除的字典ID + */ + public void deleteDictTypeByIds(Long[] dictIds); + + /** + * 加载字典缓存数据 + */ + public void loadingDictCache(); + + /** + * 清空字典缓存数据 + */ + public void clearDictCache(); + + /** + * 重置字典缓存数据 + */ + public void resetDictCache(); + + /** + * 新增保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public boolean checkDictTypeUnique(SysDictType dictType); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysLogininforService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysLogininforService.java new file mode 100644 index 0000000..9b2e29e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysLogininforService.java @@ -0,0 +1,41 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysLogininfor; +import org.springframework.stereotype.Service; + +/** + * 系统访问日志情况信息 服务层 + * + * @author ruoyi + */ +public interface ISysLogininforService +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public int insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + public int deleteLogininforByIds(Long[] infoIds); + + /** + * 清空系统登录日志 + */ + public void cleanLogininfor(); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysMenuService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysMenuService.java new file mode 100644 index 0000000..223292f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysMenuService.java @@ -0,0 +1,145 @@ +package com.zeroerr.system.service; + +import java.util.List; +import java.util.Set; +import com.zeroerr.system.domain.SysMenu; +import com.zeroerr.system.domain.vo.RouterVo; +import com.zeroerr.system.domain.vo.TreeSelect; +import org.springframework.stereotype.Service; + +/** + * 菜单 业务层 + * + * @author ruoyi + */ +public interface ISysMenuService +{ + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(Long userId); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu, Long userId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectMenuPermsByUserId(Long userId); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public Set selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询菜单树信息 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(Long roleId); + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + public List buildMenus(List menus); + + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ + public List buildMenuTree(List menus); + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + public List buildMenuTreeSelect(List menus); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean hasChildByMenuId(Long menuId); + + /** + * 查询菜单是否存在角色 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkMenuExistRole(Long menuId); + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean checkMenuNameUnique(SysMenu menu); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysNoticeService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysNoticeService.java new file mode 100644 index 0000000..c55236d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysNoticeService.java @@ -0,0 +1,61 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.domain.SysNotice; +import org.springframework.stereotype.Service; + +/** + * 公告 服务层 + * + * @author ruoyi + */ +public interface ISysNoticeService +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 删除公告信息 + * + * @param noticeId 公告ID + * @return 结果 + */ + public int deleteNoticeById(Long noticeId); + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + public int deleteNoticeByIds(Long[] noticeIds); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysOperLogService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysOperLogService.java new file mode 100644 index 0000000..ef24076 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysOperLogService.java @@ -0,0 +1,50 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysOperLog; +import org.springframework.stereotype.Service; + +/** + * 操作日志 服务层 + * + * @author ruoyi + */ +public interface ISysOperLogService +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + * @return 结果 + */ + public int insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + public int deleteOperLogByIds(Long[] operIds); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPermissionService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPermissionService.java new file mode 100644 index 0000000..98edf30 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPermissionService.java @@ -0,0 +1,28 @@ +package com.zeroerr.system.service; + +import java.util.Set; + +import com.zeroerr.system.api.domain.SysUser; +import org.springframework.stereotype.Service; + +/** + * 权限信息 服务层 + * + * @author ruoyi + */ +public interface ISysPermissionService +{ + /** + * 获取角色数据权限 + * + * @return 角色权限信息 + */ + public Set getRolePermission(SysUser user); + + /** + * 获取菜单数据权限 + * + * @return 菜单权限信息 + */ + public Set getMenuPermission(SysUser user); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPostService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPostService.java new file mode 100644 index 0000000..69924bb --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysPostService.java @@ -0,0 +1,100 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.domain.SysPost; +import org.springframework.stereotype.Service; + +/** + * 岗位信息 服务层 + * + * @author ruoyi + */ +public interface ISysPostService +{ + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位列表 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + public List selectPostListByUserId(Long userId); + + /** + * 校验岗位名称 + * + * @param post 岗位信息 + * @return 结果 + */ + public boolean checkPostNameUnique(SysPost post); + + /** + * 校验岗位编码 + * + * @param post 岗位信息 + * @return 结果 + */ + public boolean checkPostCodeUnique(SysPost post); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + public int deletePostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + public int deletePostByIds(Long[] postIds); + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysRoleService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysRoleService.java new file mode 100644 index 0000000..aecdc96 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysRoleService.java @@ -0,0 +1,178 @@ +package com.zeroerr.system.service; + +import java.util.List; +import java.util.Set; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.domain.SysUserRole; +import org.springframework.stereotype.Service; + +/** + * 角色业务层 + * + * @author ruoyi + */ +public interface ISysRoleService +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色列表 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolesByUserId(Long userId); + + /** + * 根据用户ID查询角色权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleNameUnique(SysRole role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleKeyUnique(SysRole role); + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + public void checkRoleAllowed(SysRole role); + + /** + * 校验角色是否有数据权限 + * + * @param roleIds 角色id + */ + public void checkRoleDataScope(Long... roleIds); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRoleStatus(SysRole role); + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int authDataScope(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds); + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteAuthUser(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + public int deleteAuthUsers(Long roleId, Long[] userIds); + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int insertAuthUsers(Long roleId, Long[] userIds); + + SysRole getBoss(); + + List rolesByUserId(Long userId); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserOnlineService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserOnlineService.java new file mode 100644 index 0000000..2c2a9fd --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserOnlineService.java @@ -0,0 +1,49 @@ +package com.zeroerr.system.service; + +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.domain.SysUserOnline; +import org.springframework.stereotype.Service; + +/** + * 在线用户 服务层 + * + * @author ruoyi + */ +public interface ISysUserOnlineService +{ + /** + * 通过登录地址查询信息 + * + * @param ipaddr 登录地址 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); + + /** + * 通过用户名称查询信息 + * + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); + + /** + * 通过登录地址/用户名称查询信息 + * + * @param ipaddr 登录地址 + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); + + /** + * 设置在线用户信息 + * + * @param user 用户信息 + * @return 在线用户 + */ + public SysUserOnline loginUserToUserOnline(LoginUser user); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserService.java new file mode 100644 index 0000000..d8c3dfa --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/ISysUserService.java @@ -0,0 +1,217 @@ +package com.zeroerr.system.service; + +import java.util.List; +import com.zeroerr.system.api.domain.SysUser; +import org.springframework.stereotype.Service; + +/** + * 用户 业务层 + * + * @author ruoyi + */ +public interface ISysUserService +{ + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser user); + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 根据用户ID查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserRoleGroup(String userName); + + /** + * 根据用户ID查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserPostGroup(String userName); + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkUserNameUnique(SysUser user); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkPhoneUnique(SysUser user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkEmailUnique(SysUser user); + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + public void checkUserAllowed(SysUser user); + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + public void checkUserDataScope(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean registerUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserAuth(Long userId, Long[] roleIds); + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserStatus(SysUser user); + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean updateUserProfile(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public boolean updateUserAvatar(String userName, String avatar); + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + public int resetPwd(SysUser user); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(String userName, String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据 + * @param operName 操作用户 + * @return 结果 + */ + public String importUser(List userList, Boolean isUpdateSupport, String operName); + + SysUser getUser(Long roleId); + + SysUser selectCEORole(); + + List selectHrList(); + + List selectAllUserList(); + + String selectUserPostStructureGroup(String username); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/RecruitStructureService.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/RecruitStructureService.java new file mode 100644 index 0000000..ba7badf --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/RecruitStructureService.java @@ -0,0 +1,57 @@ +package com.zeroerr.system.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.domain.vo.TreeSelect; + +import java.util.List; + +public interface RecruitStructureService extends IService { + boolean checkNodeNameUnique(RecruitStructure node); + + Long insertNode(RecruitStructure node); + + List selectNodeList(RecruitStructure node); + + void checkNodeDataScope(Long nodeId); + + int selectNormalChildrenNodeById(Long nodeId); + + int updateNode(RecruitStructure node); + + boolean hasChildByNodeId(Long nodeId); + + //boolean checkNodeExistUser(Long nodeId); + + int deleteNodeById(Long nodeId); + + RecruitStructure selectNodeById(Long nodeId); + + + List listSecond(); + + List listStructureList(); + + + void updatePostType(Long structurePostId, int i,String taskId); + + void updateByTaskId(String taskId); + + RecruitStructure getByNodeId(Long nodeId); + + List selectDeptTreeList(RecruitStructure recruitStructure); + + List selectPostAll(); + + List selectPostListByUserId (Long userId); + + RecruitStructure getDeptByNodeId(Long nodeId); + + List filterByPostIdList(List uniquePostIdList); + + String findTopLevelDepartmentNameByNodeId(Long postId); + + + List getNodeList(List nodeIds); +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/RecruitStructureServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/RecruitStructureServiceImpl.java new file mode 100644 index 0000000..3584e2d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/RecruitStructureServiceImpl.java @@ -0,0 +1,296 @@ +package com.zeroerr.system.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.vo.TreeSelect; +import com.zeroerr.system.mapper.RecruitStructureMapper; +import com.zeroerr.system.service.RecruitStructureService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class RecruitStructureServiceImpl extends ServiceImpl implements RecruitStructureService { + + @Autowired + private RecruitStructureMapper recruitStructureMapper; + + /** + * 校验节点名称是否唯一 + * + * @param node 节点信息 + * @return 结果 + */ + @Override + public boolean checkNodeNameUnique(RecruitStructure node) { + Long nodeId = StringUtils.isNull(node.getNodeId()) ? -1L : node.getNodeId(); + RecruitStructure info = recruitStructureMapper.checkNodeNameUnique(node.getNodeName(), node.getParentId()); + if (StringUtils.isNotNull(info) && info.getNodeId().longValue() != nodeId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增保存节点信息 + * + * @param node 节点信息 + * @return 结果 + */ + @Override + public Long insertNode(RecruitStructure node) { + RecruitStructure info = this.baseMapper.selectNodeById(node.getParentId()); + // 如果父节点不为正常状态,则不允许新增子节点 + if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) + { + throw new ServiceException("节点停用,不允许新增"); + } + node.setAncestors(info.getAncestors() + "," + node.getParentId()); + return this.baseMapper.insertNode(node); + } + + /** + * 查询节点管理数据 + * + * @param node 节点信息 + * @return 节点信息集合 + */ + @Override + public List selectNodeList(RecruitStructure node) { + return recruitStructureMapper.selectNodeList(node); + } + + /** + * 校验节点是否有数据权限 + * + * @param nodeId 节点id + */ + @Override + public void checkNodeDataScope(Long nodeId) { + //如果用户不是管理员 + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + RecruitStructure node = new RecruitStructure(); + node.setNodeId(nodeId); + List nodes = SpringUtils.getAopProxy(this).selectNodeList(node); + if (StringUtils.isEmpty(nodes)) + { + throw new ServiceException("没有权限访问组织架构数据!"); + } + } + } + + @Override + public int selectNormalChildrenNodeById(Long nodeId) { + return recruitStructureMapper.selectNormalChildrenNodeById(nodeId); + } + + @Override + public int updateNode(RecruitStructure node) { + RecruitStructure newParentNode = recruitStructureMapper.selectNodeById(node.getParentId()); + RecruitStructure oldNode = recruitStructureMapper.selectNodeById(node.getNodeId()); + if (StringUtils.isNotNull(newParentNode) && StringUtils.isNotNull(oldNode)) + { + String newAncestors = newParentNode.getAncestors() + "," + newParentNode.getNodeId(); + String oldAncestors = oldNode.getAncestors(); + node.setAncestors(newAncestors); + updateNodeChildren(node.getNodeId(), newAncestors, oldAncestors); + } + int result = recruitStructureMapper.updateNode(node); + if (UserConstants.DEPT_NORMAL.equals(node.getStatus()) && StringUtils.isNotEmpty(node.getAncestors()) + && !StringUtils.equals("0", node.getAncestors())) + { + // 如果该部门是启用状态,则启用该部门的所有上级部门 + updateParentNodeStatusNormal(node); + } + return result; + } + + @Override + public boolean hasChildByNodeId(Long nodeId) { + int result = recruitStructureMapper.hasChildByNodeId(nodeId); + return result > 0; + } + +// @Override +// public boolean checkNodeExistUser(Long nodeId) { +// int result = recruitStructureMapper.checkNodeExistUser(nodeId); +// return result > 0; +// } + + @Override + public int deleteNodeById(Long nodeId) { + return recruitStructureMapper.deleteNodeById(nodeId); + } + + @Override + public RecruitStructure selectNodeById(Long nodeId) { + return recruitStructureMapper.selectNodeById(nodeId); + } + + @Override + public List listSecond() { + return recruitStructureMapper.listSecond(); + } + + @Override + public List listStructureList() { + return recruitStructureMapper.listStructureList(); + } + + @Override + public void updatePostType(Long structurePostId, int i,String taskId) { + recruitStructureMapper.updatePostType(structurePostId,i,taskId); + } + + @Override + public void updateByTaskId(String taskId) { + recruitStructureMapper.updateByTaskId(taskId); + } + + @Override + public RecruitStructure getByNodeId(Long nodeId) { + return recruitStructureMapper.getByNodeId(nodeId); + } + + @Override + public List selectDeptTreeList(RecruitStructure recruitStructure) { + List depts = recruitStructureMapper.selectDeptList(recruitStructure); + return buildDeptTreeSelect(depts); + } + + @Override + public List selectPostAll() { + return recruitStructureMapper.selectPostAll(); + } + + @Override + public List selectPostListByUserId(Long userId) { + return recruitStructureMapper.selectPostListByUserId(userId); + } + + @Override + public RecruitStructure getDeptByNodeId(Long nodeId) { + return recruitStructureMapper.getDeptByNodeId(nodeId); + } + + @Override + public List filterByPostIdList(List uniquePostIdList) { + return recruitStructureMapper.filterByPostIdList(uniquePostIdList); + } + + @Override + public String findTopLevelDepartmentNameByNodeId(Long postId) { + return recruitStructureMapper.findTopLevelDepartmentNameByNodeId(postId); + } + + @Override + public List getNodeList(List nodeIds) { + return recruitStructureMapper.getNodeList(nodeIds); + } + +// @Override +// public List getByNodeIds(List nodeIds) { +// return recruitStructureMapper.getByNodeIds(nodeIds); +// } + + + private List buildDeptTreeSelect(List depts) { + List deptTrees = buildDeptTree(depts); + return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + private List buildDeptTree(List depts) { + List returnList = new ArrayList(); + List tempList = depts.stream().map(RecruitStructure::getNodeId).collect(Collectors.toList()); + for (RecruitStructure dept : depts) + { + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(dept.getParentId())) + { + recursionFn(depts, dept); + returnList.add(dept); + } + } + if (returnList.isEmpty()) + { + returnList = depts; + } + return returnList; + } + + private void recursionFn(List list, RecruitStructure t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (RecruitStructure tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + private List getChildList(List list, RecruitStructure t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + RecruitStructure n = (RecruitStructure) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getNodeId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + + private boolean hasChild(List list, RecruitStructure t) + { + return getChildList(list, t).size() > 0; + } + + private void updateParentNodeStatusNormal(RecruitStructure node) { + String ancestors = node.getAncestors(); + Long[] nodeIds = Convert.toLongArray(ancestors); + recruitStructureMapper.updateNodeStatusNormal(nodeIds); + } + + /** + * 修改子元素关系 + * + * @param nodeId 被修改的节点ID + * @param newAncestors 新的父ID集合 + * @param oldAncestors 旧的父ID集合 + */ + private void updateNodeChildren(Long nodeId, String newAncestors, String oldAncestors) { + List children = recruitStructureMapper.selectChildrenNodeById(nodeId); + for (RecruitStructure child : children) + { + child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); + } + if (children.size() > 0) + { + recruitStructureMapper.updateNodeChildren(children); + } + } + + +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysConfigServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..ebf37d3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,213 @@ +package com.zeroerr.system.service.impl; + +import java.util.Collection; +import java.util.List; +import javax.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.constant.CacheConstants; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.redis.service.RedisService; +import com.zeroerr.system.domain.SysConfig; +import com.zeroerr.system.mapper.SysConfigMapper; +import com.zeroerr.system.service.ISysConfigService; + +/** + * 参数配置 服务层实现 + * + * @author ruoyi + */ +@Service +public class SysConfigServiceImpl implements ISysConfigService +{ + @Autowired + private SysConfigMapper configMapper; + + @Autowired + private RedisService redisService; + + /** + * 项目启动时,初始化参数到缓存 + */ + @PostConstruct + public void init() + { + loadingConfigCache(); + } + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + @Override + public SysConfig selectConfigById(Long configId) + { + SysConfig config = new SysConfig(); + config.setConfigId(configId); + return configMapper.selectConfig(config); + } + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数key + * @return 参数键值 + */ + @Override + public String selectConfigByKey(String configKey) + { + String configValue = Convert.toStr(redisService.getCacheObject(getCacheKey(configKey))); + if (StringUtils.isNotEmpty(configValue)) + { + return configValue; + } + SysConfig config = new SysConfig(); + config.setConfigKey(configKey); + SysConfig retConfig = configMapper.selectConfig(config); + if (StringUtils.isNotNull(retConfig)) + { + redisService.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); + return retConfig.getConfigValue(); + } + return StringUtils.EMPTY; + } + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + @Override + public List selectConfigList(SysConfig config) + { + return configMapper.selectConfigList(config); + } + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int insertConfig(SysConfig config) + { + int row = configMapper.insertConfig(config); + if (row > 0) + { + redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + return row; + } + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int updateConfig(SysConfig config) + { + SysConfig temp = configMapper.selectConfigById(config.getConfigId()); + if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) + { + redisService.deleteObject(getCacheKey(temp.getConfigKey())); + } + + int row = configMapper.updateConfig(config); + if (row > 0) + { + redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + return row; + } + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + @Override + public void deleteConfigByIds(Long[] configIds) + { + for (Long configId : configIds) + { + SysConfig config = selectConfigById(configId); + if (StringUtils.equals(UserConstants.YES, config.getConfigType())) + { + throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); + } + configMapper.deleteConfigById(configId); + redisService.deleteObject(getCacheKey(config.getConfigKey())); + } + } + + /** + * 加载参数缓存数据 + */ + @Override + public void loadingConfigCache() + { + List configsList = configMapper.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) + { + redisService.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + } + + /** + * 清空参数缓存数据 + */ + @Override + public void clearConfigCache() + { + Collection keys = redisService.keys(CacheConstants.SYS_CONFIG_KEY + "*"); + redisService.deleteObject(keys); + } + + /** + * 重置参数缓存数据 + */ + @Override + public void resetConfigCache() + { + clearConfigCache(); + loadingConfigCache(); + } + + /** + * 校验参数键名是否唯一 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public boolean checkConfigKeyUnique(SysConfig config) + { + Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); + SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + private String getCacheKey(String configKey) + { + return CacheConstants.SYS_CONFIG_KEY + configKey; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDeptServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDeptServiceImpl.java new file mode 100644 index 0000000..4907cdc --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDeptServiceImpl.java @@ -0,0 +1,338 @@ +package com.zeroerr.system.service.impl; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.text.Convert; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.datascope.annotation.DataScope; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysDept; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.vo.TreeSelect; +import com.zeroerr.system.mapper.SysDeptMapper; +import com.zeroerr.system.mapper.SysRoleMapper; +import com.zeroerr.system.service.ISysDeptService; + +/** + * 部门管理 服务实现 + * + * @author ruoyi + */ +@Service +public class SysDeptServiceImpl implements ISysDeptService +{ + @Autowired + private SysDeptMapper deptMapper; + + @Autowired + private SysRoleMapper roleMapper; + + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @Override + @DataScope(deptAlias = "d") + public List selectDeptList(SysDept dept) + { + return deptMapper.selectDeptList(dept); + } + + /** + * 查询部门树结构信息 + * + * @param dept 部门信息 + * @return 部门树信息集合 + */ + @Override + public List selectDeptTreeList(SysDept dept) + { + List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + return buildDeptTreeSelect(depts); + } + + /** + * 构建前端所需要树结构 + * + * @param depts 部门列表 + * @return 树结构列表 + */ + @Override + public List buildDeptTree(List depts) + { + List returnList = new ArrayList(); + List tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList()); + for (SysDept dept : depts) + { + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(dept.getParentId())) + { + recursionFn(depts, dept); + returnList.add(dept); + } + } + if (returnList.isEmpty()) + { + returnList = depts; + } + return returnList; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + @Override + public List buildDeptTreeSelect(List depts) + { + List deptTrees = buildDeptTree(depts); + return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + @Override + public List selectDeptListByRoleId(Long roleId) + { + SysRole role = roleMapper.selectRoleById(roleId); + return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); + } + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + @Override + public SysDept selectDeptById(Long deptId) + { + return deptMapper.selectDeptById(deptId); + } + + /** + * 根据ID查询所有子部门(正常状态) + * + * @param deptId 部门ID + * @return 子部门数 + */ + @Override + public int selectNormalChildrenDeptById(Long deptId) + { + return deptMapper.selectNormalChildrenDeptById(deptId); + } + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public boolean hasChildByDeptId(Long deptId) + { + int result = deptMapper.hasChildByDeptId(deptId); + return result > 0; + } + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + @Override + public boolean checkDeptExistUser(Long deptId) + { + int result = deptMapper.checkDeptExistUser(deptId); + return result > 0; + } + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public boolean checkDeptNameUnique(SysDept dept) + { + Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); + SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); + if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + @Override + public void checkDeptDataScope(Long deptId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId()) && StringUtils.isNotNull(deptId)) + { + SysDept dept = new SysDept(); + dept.setDeptId(deptId); + List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + if (StringUtils.isEmpty(depts)) + { + throw new ServiceException("没有权限访问部门数据!"); + } + } + } + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int insertDept(SysDept dept) + { + SysDept info = deptMapper.selectDeptById(dept.getParentId()); + // 如果父节点不为正常状态,则不允许新增子节点 + if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) + { + throw new ServiceException("部门停用,不允许新增"); + } + dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); + return deptMapper.insertDept(dept); + } + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int updateDept(SysDept dept) + { + SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); + SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); + if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) + { + String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); + String oldAncestors = oldDept.getAncestors(); + dept.setAncestors(newAncestors); + updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); + } + int result = deptMapper.updateDept(dept); + if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) + && !StringUtils.equals("0", dept.getAncestors())) + { + // 如果该部门是启用状态,则启用该部门的所有上级部门 + updateParentDeptStatusNormal(dept); + } + return result; + } + + /** + * 修改该部门的父级部门状态 + * + * @param dept 当前部门 + */ + private void updateParentDeptStatusNormal(SysDept dept) + { + String ancestors = dept.getAncestors(); + Long[] deptIds = Convert.toLongArray(ancestors); + deptMapper.updateDeptStatusNormal(deptIds); + } + + /** + * 修改子元素关系 + * + * @param deptId 被修改的部门ID + * @param newAncestors 新的父ID集合 + * @param oldAncestors 旧的父ID集合 + */ + public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) + { + List children = deptMapper.selectChildrenDeptById(deptId); + for (SysDept child : children) + { + child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); + } + if (children.size() > 0) + { + deptMapper.updateDeptChildren(children); + } + } + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public int deleteDeptById(Long deptId) + { + return deptMapper.deleteDeptById(deptId); + } + + /** + * 递归列表 + */ + private void recursionFn(List list, SysDept t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (SysDept tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + /** + * 得到子节点列表 + */ + private List getChildList(List list, SysDept t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + SysDept n = (SysDept) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, SysDept t) + { + return getChildList(list, t).size() > 0 ? true : false; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictDataServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictDataServiceImpl.java new file mode 100644 index 0000000..e4af8a8 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictDataServiceImpl.java @@ -0,0 +1,116 @@ +package com.zeroerr.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.security.utils.DictUtils; +import com.zeroerr.system.api.domain.SysDictData; +import com.zeroerr.system.mapper.SysDictDataMapper; +import com.zeroerr.system.service.ISysDictDataService; + +/** + * 字典 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysDictDataServiceImpl implements ISysDictDataService +{ + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataList(SysDictData dictData) + { + return dictDataMapper.selectDictDataList(dictData); + } + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + @Override + public String selectDictLabel(String dictType, String dictValue) + { + return dictDataMapper.selectDictLabel(dictType, dictValue); + } + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + @Override + public SysDictData selectDictDataById(Long dictCode) + { + return dictDataMapper.selectDictDataById(dictCode); + } + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + @Override + public void deleteDictDataByIds(Long[] dictCodes) + { + for (Long dictCode : dictCodes) + { + SysDictData data = selectDictDataById(dictCode); + dictDataMapper.deleteDictDataById(dictCode); + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + } + + /** + * 新增保存字典数据信息 + * + * @param data 字典数据信息 + * @return 结果 + */ + @Override + public int insertDictData(SysDictData data) + { + int row = dictDataMapper.insertDictData(data); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + return row; + } + + /** + * 修改保存字典数据信息 + * + * @param data 字典数据信息 + * @return 结果 + */ + @Override + public int updateDictData(SysDictData data) + { + int row = dictDataMapper.updateDictData(data); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + return row; + } + + @Override + public SysDictData selectByChannel(String channel, String recruit_process_channel) { + return dictDataMapper.selectByChannel(channel,recruit_process_channel); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictTypeServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictTypeServiceImpl.java new file mode 100644 index 0000000..708b4c0 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysDictTypeServiceImpl.java @@ -0,0 +1,223 @@ +package com.zeroerr.system.service.impl; + +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.utils.DictUtils; +import com.zeroerr.system.api.domain.SysDictData; +import com.zeroerr.system.api.domain.SysDictType; +import com.zeroerr.system.mapper.SysDictDataMapper; +import com.zeroerr.system.mapper.SysDictTypeMapper; +import com.zeroerr.system.service.ISysDictTypeService; + +/** + * 字典 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysDictTypeServiceImpl implements ISysDictTypeService +{ + @Autowired + private SysDictTypeMapper dictTypeMapper; + + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 项目启动时,初始化字典到缓存 + */ + @PostConstruct + public void init() + { + loadingDictCache(); + } + + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeList(SysDictType dictType) + { + return dictTypeMapper.selectDictTypeList(dictType); + } + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeAll() + { + return dictTypeMapper.selectDictTypeAll(); + } + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataByType(String dictType) + { + List dictDatas = DictUtils.getDictCache(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + return dictDatas; + } + dictDatas = dictDataMapper.selectDictDataByType(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + DictUtils.setDictCache(dictType, dictDatas); + return dictDatas; + } + return null; + } + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + @Override + public SysDictType selectDictTypeById(Long dictId) + { + return dictTypeMapper.selectDictTypeById(dictId); + } + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + @Override + public SysDictType selectDictTypeByType(String dictType) + { + return dictTypeMapper.selectDictTypeByType(dictType); + } + + /** + * 批量删除字典类型信息 + * + * @param dictIds 需要删除的字典ID + */ + @Override + public void deleteDictTypeByIds(Long[] dictIds) + { + for (Long dictId : dictIds) + { + SysDictType dictType = selectDictTypeById(dictId); + if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); + } + dictTypeMapper.deleteDictTypeById(dictId); + DictUtils.removeDictCache(dictType.getDictType()); + } + } + + /** + * 加载字典缓存数据 + */ + @Override + public void loadingDictCache() + { + SysDictData dictData = new SysDictData(); + dictData.setStatus("0"); + Map> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType)); + for (Map.Entry> entry : dictDataMap.entrySet()) + { + DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList())); + } + } + + /** + * 清空字典缓存数据 + */ + @Override + public void clearDictCache() + { + DictUtils.clearDictCache(); + } + + /** + * 重置字典缓存数据 + */ + @Override + public void resetDictCache() + { + clearDictCache(); + loadingDictCache(); + } + + /** + * 新增保存字典类型信息 + * + * @param dict 字典类型信息 + * @return 结果 + */ + @Override + public int insertDictType(SysDictType dict) + { + int row = dictTypeMapper.insertDictType(dict); + if (row > 0) + { + DictUtils.setDictCache(dict.getDictType(), null); + } + return row; + } + + /** + * 修改保存字典类型信息 + * + * @param dict 字典类型信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateDictType(SysDictType dict) + { + SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); + dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType()); + int row = dictTypeMapper.updateDictType(dict); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); + DictUtils.setDictCache(dict.getDictType(), dictDatas); + } + return row; + } + + /** + * 校验字典类型称是否唯一 + * + * @param dict 字典类型 + * @return 结果 + */ + @Override + public boolean checkDictTypeUnique(SysDictType dict) + { + Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); + SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); + if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysLogininforServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysLogininforServiceImpl.java new file mode 100644 index 0000000..9eac62d --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysLogininforServiceImpl.java @@ -0,0 +1,65 @@ +package com.zeroerr.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.system.api.domain.SysLogininfor; +import com.zeroerr.system.mapper.SysLogininforMapper; +import com.zeroerr.system.service.ISysLogininforService; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysLogininforServiceImpl implements ISysLogininforService +{ + + @Autowired + private SysLogininforMapper logininforMapper; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public int insertLogininfor(SysLogininfor logininfor) + { + return logininforMapper.insertLogininfor(logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + @Override + public List selectLogininforList(SysLogininfor logininfor) + { + return logininforMapper.selectLogininforList(logininfor); + } + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + @Override + public int deleteLogininforByIds(Long[] infoIds) + { + return logininforMapper.deleteLogininforByIds(infoIds); + } + + /** + * 清空系统登录日志 + */ + @Override + public void cleanLogininfor() + { + logininforMapper.cleanLogininfor(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysMenuServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysMenuServiceImpl.java new file mode 100644 index 0000000..5220ebd --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysMenuServiceImpl.java @@ -0,0 +1,543 @@ +package com.zeroerr.system.service.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.constant.Constants; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.SysMenu; +import com.zeroerr.system.domain.vo.MetaVo; +import com.zeroerr.system.domain.vo.RouterVo; +import com.zeroerr.system.domain.vo.TreeSelect; +import com.zeroerr.system.mapper.SysMenuMapper; +import com.zeroerr.system.mapper.SysRoleMapper; +import com.zeroerr.system.mapper.SysRoleMenuMapper; +import com.zeroerr.system.service.ISysMenuService; + +/** + * 菜单 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysMenuServiceImpl implements ISysMenuService +{ + public static final String PREMISSION_STRING = "perms[\"{0}\"]"; + + @Autowired + private SysMenuMapper menuMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + @Override + public List selectMenuList(Long userId) + { + return selectMenuList(new SysMenu(), userId); + } + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + @Override + public List selectMenuList(SysMenu menu, Long userId) + { + List menuList = null; + // 管理员显示所有菜单信息 + if (SysUser.isAdmin(userId)) + { + menuList = menuMapper.selectMenuList(menu); + } + else + { + menu.getParams().put("userId", userId); + menuList = menuMapper.selectMenuListByUserId(menu); + } + return menuList; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByUserId(Long userId) + { + List perms = menuMapper.selectMenuPermsByUserId(userId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByRoleId(Long roleId) + { + List perms = menuMapper.selectMenuPermsByRoleId(roleId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户名称 + * @return 菜单列表 + */ + @Override + public List selectMenuTreeByUserId(Long userId) + { + List menus = null; + if (SecurityUtils.isAdmin(userId)) + { + menus = menuMapper.selectMenuTreeAll(); + } + else + { + menus = menuMapper.selectMenuTreeByUserId(userId); + } + return getChildPerms(menus, 0); + } + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + @Override + public List selectMenuListByRoleId(Long roleId) + { + SysRole role = roleMapper.selectRoleById(roleId); + return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); + } + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + @Override + public List buildMenus(List menus) + { + List routers = new LinkedList(); + for (SysMenu menu : menus) + { + RouterVo router = new RouterVo(); + router.setHidden("1".equals(menu.getVisible())); + router.setName(getRouteName(menu)); + router.setPath(getRouterPath(menu)); + router.setComponent(getComponent(menu)); + router.setQuery(menu.getQuery()); + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + List cMenus = menu.getChildren(); + if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) + { + router.setAlwaysShow(true); + router.setRedirect("noRedirect"); + router.setChildren(buildMenus(cMenus)); + } + else if (isMenuFrame(menu)) + { + router.setMeta(null); + List childrenList = new ArrayList(); + RouterVo children = new RouterVo(); + children.setPath(menu.getPath()); + children.setComponent(menu.getComponent()); + children.setName(getRouteName(menu.getRouteName(), menu.getPath())); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + children.setQuery(menu.getQuery()); + childrenList.add(children); + router.setChildren(childrenList); + } + else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) + { + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); + router.setPath("/"); + List childrenList = new ArrayList(); + RouterVo children = new RouterVo(); + String routerPath = innerLinkReplaceEach(menu.getPath()); + children.setPath(routerPath); + children.setComponent(UserConstants.INNER_LINK); + children.setName(getRouteName(menu.getRouteName(), routerPath)); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); + childrenList.add(children); + router.setChildren(childrenList); + } + routers.add(router); + } + return routers; + } + + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ + @Override + public List buildMenuTree(List menus) + { + List returnList = new ArrayList(); + List tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList()); + for (Iterator iterator = menus.iterator(); iterator.hasNext();) + { + SysMenu menu = (SysMenu) iterator.next(); + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(menu.getParentId())) + { + recursionFn(menus, menu); + returnList.add(menu); + } + } + if (returnList.isEmpty()) + { + returnList = menus; + } + return returnList; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + @Override + public List buildMenuTreeSelect(List menus) + { + List menuTrees = buildMenuTree(menus); + return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + @Override + public SysMenu selectMenuById(Long menuId) + { + return menuMapper.selectMenuById(menuId); + } + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean hasChildByMenuId(Long menuId) + { + int result = menuMapper.hasChildByMenuId(menuId); + return result > 0; + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean checkMenuExistRole(Long menuId) + { + int result = roleMenuMapper.checkMenuExistRole(menuId); + return result > 0; + } + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int insertMenu(SysMenu menu) + { + return menuMapper.insertMenu(menu); + } + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int updateMenu(SysMenu menu) + { + return menuMapper.updateMenu(menu); + } + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int deleteMenuById(Long menuId) + { + return menuMapper.deleteMenuById(menuId); + } + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public boolean checkMenuNameUnique(SysMenu menu) + { + Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); + SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 获取路由名称 + * + * @param menu 菜单信息 + * @return 路由名称 + */ + public String getRouteName(SysMenu menu) + { + // 非外链并且是一级目录(类型为目录) + if (isMenuFrame(menu)) + { + return StringUtils.EMPTY; + } + return getRouteName(menu.getRouteName(), menu.getPath()); + } + + /** + * 获取路由名称,如没有配置路由名称则取路由地址 + * + * @param routerName 路由名称 + * @param path 路由地址 + * @return 路由名称(驼峰格式) + */ + public String getRouteName(String name, String path) + { + String routerName = StringUtils.isNotEmpty(name) ? name : path; + return StringUtils.capitalize(routerName); + } + + /** + * 获取路由地址 + * + * @param menu 菜单信息 + * @return 路由地址 + */ + public String getRouterPath(SysMenu menu) + { + String routerPath = menu.getPath(); + // 内链打开外网方式 + if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) + { + routerPath = innerLinkReplaceEach(routerPath); + } + // 非外链并且是一级目录(类型为目录) + if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) + && UserConstants.NO_FRAME.equals(menu.getIsFrame())) + { + routerPath = "/" + menu.getPath(); + } + // 非外链并且是一级目录(类型为菜单) + else if (isMenuFrame(menu)) + { + routerPath = "/"; + } + return routerPath; + } + + /** + * 获取组件信息 + * + * @param menu 菜单信息 + * @return 组件信息 + */ + public String getComponent(SysMenu menu) + { + String component = UserConstants.LAYOUT; + if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) + { + component = menu.getComponent(); + } + else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) + { + component = UserConstants.INNER_LINK; + } + else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) + { + component = UserConstants.PARENT_VIEW; + } + return component; + } + + /** + * 是否为菜单内部跳转 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isMenuFrame(SysMenu menu) + { + return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) + && menu.getIsFrame().equals(UserConstants.NO_FRAME); + } + + /** + * 是否为内链组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isInnerLink(SysMenu menu) + { + return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); + } + + /** + * 是否为parent_view组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isParentView(SysMenu menu) + { + return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); + } + + /** + * 根据父节点的ID获取所有子节点 + * + * @param list 分类表 + * @param parentId 传入的父节点ID + * @return String + */ + public List getChildPerms(List list, int parentId) + { + List returnList = new ArrayList(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) + { + SysMenu t = (SysMenu) iterator.next(); + // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 + if (t.getParentId() == parentId) + { + recursionFn(list, t); + returnList.add(t); + } + } + return returnList; + } + + /** + * 递归列表 + * + * @param list 分类表 + * @param t 子节点 + */ + private void recursionFn(List list, SysMenu t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (SysMenu tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + /** + * 得到子节点列表 + */ + private List getChildList(List list, SysMenu t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + SysMenu n = (SysMenu) it.next(); + if (n.getParentId().longValue() == t.getMenuId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, SysMenu t) + { + return getChildList(list, t).size() > 0; + } + + /** + * 内链域名特殊字符替换 + * + * @return 替换后的内链域名 + */ + public String innerLinkReplaceEach(String path) + { + return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":" }, + new String[] { "", "", "", "/", "/" }); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysNoticeServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 0000000..3db2e51 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,92 @@ +package com.zeroerr.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.system.domain.SysNotice; +import com.zeroerr.system.mapper.SysNoticeMapper; +import com.zeroerr.system.service.ISysNoticeService; + +/** + * 公告 服务层实现 + * + * @author ruoyi + */ +@Service +public class SysNoticeServiceImpl implements ISysNoticeService +{ + @Autowired + private SysNoticeMapper noticeMapper; + + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + @Override + public SysNotice selectNoticeById(Long noticeId) + { + return noticeMapper.selectNoticeById(noticeId); + } + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + @Override + public List selectNoticeList(SysNotice notice) + { + return noticeMapper.selectNoticeList(notice); + } + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int insertNotice(SysNotice notice) + { + return noticeMapper.insertNotice(notice); + } + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int updateNotice(SysNotice notice) + { + return noticeMapper.updateNotice(notice); + } + + /** + * 删除公告对象 + * + * @param noticeId 公告ID + * @return 结果 + */ + @Override + public int deleteNoticeById(Long noticeId) + { + return noticeMapper.deleteNoticeById(noticeId); + } + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + @Override + public int deleteNoticeByIds(Long[] noticeIds) + { + return noticeMapper.deleteNoticeByIds(noticeIds); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysOperLogServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysOperLogServiceImpl.java new file mode 100644 index 0000000..f227f09 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysOperLogServiceImpl.java @@ -0,0 +1,77 @@ +package com.zeroerr.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.system.api.domain.SysOperLog; +import com.zeroerr.system.mapper.SysOperLogMapper; +import com.zeroerr.system.service.ISysOperLogService; + +/** + * 操作日志 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysOperLogServiceImpl implements ISysOperLogService +{ + @Autowired + private SysOperLogMapper operLogMapper; + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + * @return 结果 + */ + @Override + public int insertOperlog(SysOperLog operLog) + { + return operLogMapper.insertOperlog(operLog); + } + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + @Override + public List selectOperLogList(SysOperLog operLog) + { + return operLogMapper.selectOperLogList(operLog); + } + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + @Override + public int deleteOperLogByIds(Long[] operIds) + { + return operLogMapper.deleteOperLogByIds(operIds); + } + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + @Override + public SysOperLog selectOperLogById(Long operId) + { + return operLogMapper.selectOperLogById(operId); + } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog() + { + operLogMapper.cleanOperLog(); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPermissionServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPermissionServiceImpl.java new file mode 100644 index 0000000..3788233 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPermissionServiceImpl.java @@ -0,0 +1,86 @@ +package com.zeroerr.system.service.impl; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.service.ISysMenuService; +import com.zeroerr.system.service.ISysPermissionService; +import com.zeroerr.system.service.ISysRoleService; + +/** + * 用户权限处理 + * + * @author ruoyi + */ +@Service +public class SysPermissionServiceImpl implements ISysPermissionService +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysMenuService menuService; + + /** + * 获取角色数据权限 + * + * @param userId 用户Id + * @return 角色权限信息 + */ + @Override + public Set getRolePermission(SysUser user) + { + Set roles = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) + { + roles.add("admin"); + } + else + { + roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId())); + } + return roles; + } + + /** + * 获取菜单数据权限 + * + * @param userId 用户Id + * @return 菜单权限信息 + */ + @Override + public Set getMenuPermission(SysUser user) + { + Set perms = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) + { + perms.add("*:*:*"); + } + else + { + List roles = user.getRoles(); + if (!CollectionUtils.isEmpty(roles)) + { + // 多角色设置permissions属性,以便数据权限匹配权限 + for (SysRole role : roles) + { + Set rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId()); + role.setPermissions(rolePerms); + perms.addAll(rolePerms); + } + } + else + { + perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); + } + } + return perms; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPostServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPostServiceImpl.java new file mode 100644 index 0000000..4362202 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysPostServiceImpl.java @@ -0,0 +1,178 @@ +package com.zeroerr.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.system.domain.SysPost; +import com.zeroerr.system.mapper.SysPostMapper; +import com.zeroerr.system.mapper.SysUserPostMapper; +import com.zeroerr.system.service.ISysPostService; + +/** + * 岗位信息 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysPostServiceImpl implements ISysPostService +{ + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位信息集合 + */ + @Override + public List selectPostList(SysPost post) + { + return postMapper.selectPostList(post); + } + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + @Override + public List selectPostAll() + { + return postMapper.selectPostAll(); + } + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + @Override + public SysPost selectPostById(Long postId) + { + return postMapper.selectPostById(postId); + } + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + @Override + public List selectPostListByUserId(Long userId) + { + return postMapper.selectPostListByUserId(userId); + } + + /** + * 校验岗位名称是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostNameUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostNameUnique(post.getPostName()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验岗位编码是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostCodeUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int countUserPostById(Long postId) + { + return userPostMapper.countUserPostById(postId); + } + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int deletePostById(Long postId) + { + return postMapper.deletePostById(postId); + } + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + @Override + public int deletePostByIds(Long[] postIds) + { + for (Long postId : postIds) + { + SysPost post = selectPostById(postId); + if (countUserPostById(postId) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); + } + } + return postMapper.deletePostByIds(postIds); + } + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int insertPost(SysPost post) + { + return postMapper.insertPost(post); + } + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int updatePost(SysPost post) + { + return postMapper.updatePost(post); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysRoleServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..dbee789 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,437 @@ +package com.zeroerr.system.service.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.datascope.annotation.DataScope; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.SysRoleDept; +import com.zeroerr.system.domain.SysRoleMenu; +import com.zeroerr.system.domain.SysUserRole; +import com.zeroerr.system.mapper.SysRoleDeptMapper; +import com.zeroerr.system.mapper.SysRoleMapper; +import com.zeroerr.system.mapper.SysRoleMenuMapper; +import com.zeroerr.system.mapper.SysUserRoleMapper; +import com.zeroerr.system.service.ISysRoleService; + +/** + * 角色 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysRoleServiceImpl implements ISysRoleService +{ + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + @Autowired + private SysRoleDeptMapper roleDeptMapper; + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + @Override + @DataScope(deptAlias = "d") + public List selectRoleList(SysRole role) + { + return roleMapper.selectRoleList(role); + } + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesByUserId(Long userId) + { + List userRoles = roleMapper.selectRolePermissionByUserId(userId); + List roles = selectRoleAll(); + for (SysRole role : roles) + { + for (SysRole userRole : userRoles) + { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) + { + role.setFlag(true); + break; + } + } + } + return roles; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectRolePermissionByUserId(Long userId) + { + List perms = roleMapper.selectRolePermissionByUserId(userId); + Set permsSet = new HashSet<>(); + for (SysRole perm : perms) + { + if (StringUtils.isNotNull(perm)) + { + permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); + } + } + return permsSet; + } + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + @Override + public List selectRoleAll() + { + return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); + } + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + @Override + public List selectRoleListByUserId(Long userId) + { + return roleMapper.selectRoleListByUserId(userId); + } + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + @Override + public SysRole selectRoleById(Long roleId) + { + return roleMapper.selectRoleById(roleId); + } + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleNameUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleKeyUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + @Override + public void checkRoleAllowed(SysRole role) + { + if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员角色"); + } + } + + /** + * 校验角色是否有数据权限 + * + * @param roleIds 角色id + */ + @Override + public void checkRoleDataScope(Long... roleIds) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + for (Long roleId : roleIds) + { + SysRole role = new SysRole(); + role.setRoleId(roleId); + List roles = SpringUtils.getAopProxy(this).selectRoleList(role); + if (StringUtils.isEmpty(roles)) + { + throw new ServiceException("没有权限访问角色数据!"); + } + } + } + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public int countUserRoleByRoleId(Long roleId) + { + return userRoleMapper.countUserRoleByRoleId(roleId); + } + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertRole(SysRole role) + { + // 新增角色信息 + roleMapper.insertRole(role); + return insertRoleMenu(role); + } + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateRole(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); + return insertRoleMenu(role); + } + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int updateRoleStatus(SysRole role) + { + return roleMapper.updateRole(role); + } + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int authDataScope(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); + // 新增角色和部门信息(数据权限) + return insertRoleDept(role); + } + + /** + * 新增角色菜单信息 + * + * @param role 角色对象 + */ + public int insertRoleMenu(SysRole role) + { + int rows = 1; + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long menuId : role.getMenuIds()) + { + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(role.getRoleId()); + rm.setMenuId(menuId); + list.add(rm); + } + if (list.size() > 0) + { + rows = roleMenuMapper.batchRoleMenu(list); + } + return rows; + } + + /** + * 新增角色部门信息(数据权限) + * + * @param role 角色对象 + */ + public int insertRoleDept(SysRole role) + { + int rows = 1; + // 新增角色与部门(数据权限)管理 + List list = new ArrayList(); + for (Long deptId : role.getDeptIds()) + { + SysRoleDept rd = new SysRoleDept(); + rd.setRoleId(role.getRoleId()); + rd.setDeptId(deptId); + list.add(rd); + } + if (list.size() > 0) + { + rows = roleDeptMapper.batchRoleDept(list); + } + return rows; + } + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteRoleById(Long roleId) + { + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(roleId); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(roleId); + return roleMapper.deleteRoleById(roleId); + } + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteRoleByIds(Long[] roleIds) + { + for (Long roleId : roleIds) + { + checkRoleAllowed(new SysRole(roleId)); + checkRoleDataScope(roleId); + SysRole role = selectRoleById(roleId); + if (countUserRoleByRoleId(roleId) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); + } + } + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenu(roleIds); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDept(roleIds); + return roleMapper.deleteRoleByIds(roleIds); + } + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + @Override + public int deleteAuthUser(SysUserRole userRole) + { + return userRoleMapper.deleteUserRoleInfo(userRole); + } + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + @Override + public int deleteAuthUsers(Long roleId, Long[] userIds) + { + return userRoleMapper.deleteUserRoleInfos(roleId, userIds); + } + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要授权的用户数据ID + * @return 结果 + */ + @Override + public int insertAuthUsers(Long roleId, Long[] userIds) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long userId : userIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + return userRoleMapper.batchUserRole(list); + } + + @Override + public SysRole getBoss() { + return roleMapper.getBoss(); + } + + @Override + public List rolesByUserId(Long userId) { + return roleMapper.rolesByUserId(userId); + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserOnlineServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserOnlineServiceImpl.java new file mode 100644 index 0000000..388cab6 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserOnlineServiceImpl.java @@ -0,0 +1,89 @@ +package com.zeroerr.system.service.impl; + +import org.springframework.stereotype.Service; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.system.api.model.LoginUser; +import com.zeroerr.system.domain.SysUserOnline; +import com.zeroerr.system.service.ISysUserOnlineService; + +/** + * 在线用户 服务层处理 + * + * @author ruoyi + */ +@Service +public class SysUserOnlineServiceImpl implements ISysUserOnlineService +{ + /** + * 通过登录地址查询信息 + * + * @param ipaddr 登录地址 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) + { + if (StringUtils.equals(ipaddr, user.getIpaddr())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 通过用户名称查询信息 + * + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) + { + if (StringUtils.equals(userName, user.getUsername())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 通过登录地址/用户名称查询信息 + * + * @param ipaddr 登录地址 + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) + { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 设置在线用户信息 + * + * @param user 用户信息 + * @return 在线用户 + */ + @Override + public SysUserOnline loginUserToUserOnline(LoginUser user) + { + if (StringUtils.isNull(user)) + { + return null; + } + SysUserOnline sysUserOnline = new SysUserOnline(); + sysUserOnline.setTokenId(user.getToken()); + sysUserOnline.setUserName(user.getUsername()); + sysUserOnline.setIpaddr(user.getIpaddr()); + sysUserOnline.setLoginTime(user.getLoginTime()); + return sysUserOnline; + } +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserServiceImpl.java b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..98f2b2e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/java/com/zeroerr/system/service/impl/SysUserServiceImpl.java @@ -0,0 +1,581 @@ +package com.zeroerr.system.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Validator; + +import com.zeroerr.system.api.domain.RecruitStructure; +import com.zeroerr.system.mapper.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import com.zeroerr.common.core.constant.UserConstants; +import com.zeroerr.common.core.exception.ServiceException; +import com.zeroerr.common.core.utils.SpringUtils; +import com.zeroerr.common.core.utils.StringUtils; +import com.zeroerr.common.core.utils.bean.BeanValidators; +import com.zeroerr.common.datascope.annotation.DataScope; +import com.zeroerr.common.security.utils.SecurityUtils; +import com.zeroerr.system.api.domain.SysRole; +import com.zeroerr.system.api.domain.SysUser; +import com.zeroerr.system.domain.SysPost; +import com.zeroerr.system.domain.SysUserPost; +import com.zeroerr.system.domain.SysUserRole; +import com.zeroerr.system.service.ISysConfigService; +import com.zeroerr.system.service.ISysDeptService; +import com.zeroerr.system.service.ISysUserService; + +/** + * 用户 业务层处理 + * + * @author ruoyi + */ +@Service +public class SysUserServiceImpl implements ISysUserService +{ + private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + @Autowired + private ISysConfigService configService; + + @Autowired + private ISysDeptService deptService; + + @Autowired + protected Validator validator; + + @Autowired + private RecruitStructureMapper recruitStructureMapper; + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUserList(SysUser user) + { + return userMapper.selectUserList(user); + } + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectAllocatedList(SysUser user) + { + return userMapper.selectAllocatedList(user); + } + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUnallocatedList(SysUser user) + { + return userMapper.selectUnallocatedList(user); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByUserName(String userName) + { + return userMapper.selectUserByUserName(userName); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserById(Long userId) + { + return userMapper.selectUserById(userId); + } + + /** + * 查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserRoleGroup(String userName) + { + List list = roleMapper.selectRolesByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); + } + + /** + * 查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserPostGroup(String userName) + { + List list = postMapper.selectPostsByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean checkUserNameUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkUserNameUnique(user.getUserName()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkPhoneUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkEmailUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkEmailUnique(user.getEmail()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + @Override + public void checkUserAllowed(SysUser user) + { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员用户"); + } + } + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + @Override + public void checkUserDataScope(Long userId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + SysUser user = new SysUser(); + user.setUserId(userId); + List users = SpringUtils.getAopProxy(this).selectUserList(user); + if (StringUtils.isEmpty(users)) + { + throw new ServiceException("没有权限访问用户数据!"); + } + } + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertUser(SysUser user) + { + // 新增用户信息 + int rows = userMapper.insertUser(user); + // 新增用户岗位关联 + insertUserPost(user); + // 新增用户与角色管理 + insertUserRole(user); + return rows; + } + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean registerUser(SysUser user) + { + return userMapper.insertUser(user) > 0; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateUser(SysUser user) + { + Long userId = user.getUserId(); + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 新增用户与角色管理 + insertUserRole(user); + // 删除用户与岗位关联 + userPostMapper.deleteUserPostByUserId(userId); + // 新增用户与岗位管理 + insertUserPost(user); + return userMapper.updateUser(user); + } + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void insertUserAuth(Long userId, Long[] roleIds) + { + userRoleMapper.deleteUserRoleByUserId(userId); + insertUserRole(userId, roleIds); + } + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserStatus(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean updateUserProfile(SysUser user) + { + return userMapper.updateUser(user) > 0; + } + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + @Override + public boolean updateUserAvatar(String userName, String avatar) + { + return userMapper.updateUserAvatar(userName, avatar) > 0; + } + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int resetPwd(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + @Override + public int resetUserPwd(String userName, String password) + { + return userMapper.resetUserPwd(userName, password); + } + + /** + * 新增用户角色信息 + * + * @param user 用户对象 + */ + public void insertUserRole(SysUser user) + { + this.insertUserRole(user.getUserId(), user.getRoleIds()); + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + */ + public void insertUserPost(SysUser user) + { + Long[] posts = user.getPostIds(); + if (StringUtils.isNotEmpty(posts)) + { + // 新增用户与岗位管理 + List list = new ArrayList(); + for (Long postId : posts) + { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + list.add(up); + } + userPostMapper.batchUserPost(list); + } + } + + /** + * 新增用户角色信息 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserRole(Long userId, Long[] roleIds) + { + if (StringUtils.isNotEmpty(roleIds)) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long roleId : roleIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + userRoleMapper.batchUserRole(list); + } + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserById(Long userId) + { + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserByIds(Long[] userIds) + { + for (Long userId : userIds) + { + checkUserAllowed(new SysUser(userId)); + checkUserDataScope(userId); + } + // 删除用户与角色关联 + userRoleMapper.deleteUserRole(userIds); + // 删除用户与岗位关联 + userPostMapper.deleteUserPost(userIds); + return userMapper.deleteUserByIds(userIds); + } + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据 + * @param operName 操作用户 + * @return 结果 + */ + @Override + public String importUser(List userList, Boolean isUpdateSupport, String operName) + { + if (StringUtils.isNull(userList) || userList.size() == 0) + { + throw new ServiceException("导入用户数据不能为空!"); + } + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + for (SysUser user : userList) + { + try + { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(user.getUserName()); + if (StringUtils.isNull(u)) + { + BeanValidators.validateWithException(validator, user); + deptService.checkDeptDataScope(user.getDeptId()); + String password = configService.selectConfigByKey("sys.user.initPassword"); + user.setPassword(SecurityUtils.encryptPassword(password)); + user.setCreateBy(operName); + userMapper.insertUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); + } + else if (isUpdateSupport) + { + BeanValidators.validateWithException(validator, user); + checkUserAllowed(u); + checkUserDataScope(u.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); + user.setUserId(u.getUserId()); + user.setUpdateBy(operName); + userMapper.updateUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); + } + else + { + failureNum++; + failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); + } + } + catch (Exception e) + { + failureNum++; + String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败:"; + failureMsg.append(msg + e.getMessage()); + log.error(msg, e); + } + } + if (failureNum > 0) + { + failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:"); + throw new ServiceException(failureMsg.toString()); + } + else + { + successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:"); + } + return successMsg.toString(); + } + + @Override + public SysUser getUser(Long roleId) { + return userMapper.getUser(roleId); + } + @Override + public SysUser selectCEORole() { + return userMapper.selectCEORole(); + } + + @Override + public List selectHrList() { + return userMapper.selectHrList(); + } + + @Override + public List selectAllUserList() { + return userMapper.selectAllUserList(); + } + + @Override + public String selectUserPostStructureGroup(String username) { + List list = recruitStructureMapper.getList(username); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(RecruitStructure::getNodeName).collect(Collectors.joining(",")); + } + +} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/banner.txt b/zeroerroa-modules/zeroerroa-system/src/main/resources/banner.txt new file mode 100644 index 0000000..fbd45f5 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/bootstrap.yml b/zeroerroa-modules/zeroerroa-system/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..02e8616 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9201 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-system + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/logback.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/logback.xml new file mode 100644 index 0000000..7783eae --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml new file mode 100644 index 0000000..be7e47e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/RecruitStructureMapper.xml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select d.node_id, + d.parent_id, + d.ancestors, + d.node_name, + d.order_num, + d.leader, + d.phone, + d.email, + d.status, + d.del_flag, + d.create_by, + d.create_time, + d.type, + d.post_type, + d.task_id, + d.post_complete_date + from recruit_structure d + + + + + + + + insert into recruit_structure( + node_id, + type, + post_type, + parent_id, + node_name, + task_id, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{nodeId}, + #{type}, + #{postType}, + #{parentId}, + #{nodeName}, + #{taskId}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + + + + + + + + update recruit_structure set ancestors = + + when #{item.nodeId} then #{item.ancestors} + + where node_id in + + #{item.nodeId} + + + + + + update recruit_structure + + parent_id = #{parentId}, + node_name = #{nodeName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + type = #{type}, + post_type = #{postType}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where node_id = #{nodeId} + + + + update recruit_structure set status = '0' where node_id in + + #{nodeId} + + + + + + + + + + + update recruit_structure + set del_flag = '2' + where node_id = #{nodeId} + + + + + + + + + update recruit_structure + set post_type=#{i}, + task_id=#{taskId} + where node_id = #{structurePostId} + + + + + update recruit_structure + set post_type=0 + where node_id = + (select structure_post_id from recruit_process_task where task_id = #{taskId}) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysConfigMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..23b96f3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + from sys_config + + + + + + + and config_id = #{configId} + + + and config_key = #{configKey} + + + + + + + + + + + + + + insert into sys_config ( + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time + )values( + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_config + + config_name = #{configName}, + config_key = #{configKey}, + config_value = #{configValue}, + config_type = #{configType}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where config_id = #{configId} + + + + delete from sys_config where config_id = #{configId} + + + + delete from sys_config where config_id in + + #{configId} + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDeptMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..5452ca1 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + sysdate() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..b91f6a3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + from sys_dict_data + + + + + + + + + + + + + + delete from sys_dict_data where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_dict_data + + dict_sort = #{dictSort}, + dict_label = #{dictLabel}, + dict_value = #{dictValue}, + dict_type = #{dictType}, + css_class = #{cssClass}, + list_class = #{listClass}, + is_default = #{isDefault}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_code = #{dictCode} + + + + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..4d0f2d0 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type + + + + + + + + + + + + + + delete from sys_dict_type where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysLogininforMapper.xml new file mode 100644 index 0000000..b1ddeac --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) + values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysMenuMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..55b835a --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + from sys_menu + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + route_name = #{routeName}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + route_name, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{routeName}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_menu where menu_id = #{menuId} + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..8401e18 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark + from sys_notice + + + + + + + + insert into sys_notice ( + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_notice + + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, + update_by = #{updateBy}, + update_time = sysdate() + + where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id in + + #{noticeId} + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..beaf0de --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time, cost_time + from sys_oper_log + + + + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + + truncate table sys_oper_log + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysPostMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..433bf70 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + from sys_post + + + + + + + + + + + + + + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + delete from sys_post where post_id = #{postId} + + + + delete from sys_post where post_id in + + #{postId} + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..c50abf3 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_dept where role_id=#{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..d690af1 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, + r.status, r.del_flag, r.create_time, r.remark + from sys_role r + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + + + + + + + + + + + + + + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + menu_check_strictly, + dept_check_strictly, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{menuCheckStrictly}, + #{deptCheckStrictly}, + #{status}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + menu_check_strictly = #{menuCheckStrictly}, + dept_check_strictly = #{deptCheckStrictly}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = sysdate() + + where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..8b22812 --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..cbc2a3e --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..e0acc2c --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_post where user_id=#{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + + + \ No newline at end of file diff --git a/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..c6b2a8f --- /dev/null +++ b/zeroerroa-modules/zeroerroa-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + + \ No newline at end of file diff --git a/zeroerroa-visual/pom.xml b/zeroerroa-visual/pom.xml new file mode 100644 index 0000000..264cb92 --- /dev/null +++ b/zeroerroa-visual/pom.xml @@ -0,0 +1,22 @@ + + + + com.zeroerr + zeroerroa + 3.6.4 + + 4.0.0 + + + zeroerroa-monitor + + + zeroerroa-visual + pom + + + zeroerroa-visual图形化管理模块 + + + diff --git a/zeroerroa-visual/zeroerroa-monitor/pom.xml b/zeroerroa-visual/zeroerroa-monitor/pom.xml new file mode 100644 index 0000000..c2de2cd --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/pom.xml @@ -0,0 +1,75 @@ + + + com.zeroerr + zeroerroa-visual + 3.6.4 + + 4.0.0 + + zeroerroa-visual-monitor + + + zeroerroa-visual-monitor监控中心 + + + + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/RuoYiMonitorApplication.java b/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/RuoYiMonitorApplication.java new file mode 100644 index 0000000..50080c6 --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/RuoYiMonitorApplication.java @@ -0,0 +1,30 @@ +package com.zeroerr.modules.monitor; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import de.codecentric.boot.admin.server.config.EnableAdminServer; + +/** + * 监控中心 + * + * @author ruoyi + */ +@EnableAdminServer +@SpringBootApplication +public class RuoYiMonitorApplication +{ + public static void main(String[] args) + { + SpringApplication.run(RuoYiMonitorApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 监控中心启动成功 ლ(´ڡ`ლ)゙ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/config/WebSecurityConfigurer.java b/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/config/WebSecurityConfigurer.java new file mode 100644 index 0000000..1567d34 --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/src/main/java/com/zeroerr/modules/monitor/config/WebSecurityConfigurer.java @@ -0,0 +1,51 @@ +package com.zeroerr.modules.monitor.config; + +import de.codecentric.boot.admin.server.config.AdminServerProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; + +/** + * 监控权限配置 + * + * @author ruoyi + */ +@EnableWebSecurity +public class WebSecurityConfigurer +{ + private final String adminContextPath; + + public WebSecurityConfigurer(AdminServerProperties adminServerProperties) + { + this.adminContextPath = adminServerProperties.getContextPath(); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception + { + SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); + successHandler.setTargetUrlParameter("redirectTo"); + successHandler.setDefaultTargetUrl(adminContextPath + "/"); + + return httpSecurity + .headers().frameOptions().disable() + .and().authorizeRequests() + .antMatchers(adminContextPath + "/assets/**" + , adminContextPath + "/login" + , adminContextPath + "/actuator/**" + , adminContextPath + "/instances/**" + ).permitAll() + .anyRequest().authenticated() + .and() + .formLogin().loginPage(adminContextPath + "/login") + .successHandler(successHandler).and() + .logout().logoutUrl(adminContextPath + "/logout") + .and() + .httpBasic().and() + .csrf() + .disable() + .build(); + } +} diff --git a/zeroerroa-visual/zeroerroa-monitor/src/main/resources/banner.txt b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/banner.txt new file mode 100644 index 0000000..ecaf8a4 --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) (_)| | + _ __ _ _ ___ _ _ _ ______ _ __ ___ ___ _ __ _ | |_ ___ _ __ +| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \ / _ \ | '_ \ | || __| / _ \ | '__| +| | | |_| || (_) || |_| || | | | | | | || (_) || | | || || |_ | (_) || | +|_| \__,_| \___/ \__, ||_| |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_| + __/ | + |___/ \ No newline at end of file diff --git a/zeroerroa-visual/zeroerroa-monitor/src/main/resources/bootstrap.yml b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..4a2926d --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9100 + +# Spring +spring: + application: + # 应用名称 + name: zeroerroa-monitor + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + config: + # 配置中心地址 + server-addr: 192.168.1.105:8848 + #命名空间 + namespace: 0a1c32f2-dea1-4ec1-b546-cb4635cd7db2 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zeroerroa-visual/zeroerroa-monitor/src/main/resources/logback.xml b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/logback.xml new file mode 100644 index 0000000..f25d255 --- /dev/null +++ b/zeroerroa-visual/zeroerroa-monitor/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file